PanteraPolnocy
10df14cf0b
FIRE-36821 Make the bracket-link tooltips a bit more skin/theme-aware (and more readable)
...
Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com >
2026-07-02 11:47:50 +02:00
Ansariel
ba96f223a3
Do this the correct way
2026-07-01 03:06:48 +02:00
minerjr
9fbe62c470
FIRE-36802 - Font - Line and Paragraph spacing
...
Added new settings.xml variable FSFontLineSpacingAdjustment used to adjust the spacing between multiline text.
Used to increase or decrease the value, supports from -10 to +10 pixels. Defaults to 0.
2026-06-30 19:41:09 -03:00
Ansariel
734392ac09
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2026-06-14 13:50:32 +02:00
PanteraPolnocy
76e5fa786f
Turn bracket links expanding/unmasking function into a well visible, large, instant preview in tooltip
...
Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com >
2026-06-14 10:45:11 +02:00
PanteraPolnocy
fd501b84df
Split FSDisableLabeledChatLinks setting into nearby-chat and everything-else
...
Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com >
2026-06-14 05:12:54 +02:00
Ansariel
0f26f3129f
Merge branch 'project/Flat_UI' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llfontfreetype.cpp
# indra/llui/lldraghandle.cpp
# indra/llui/lldraghandle.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderviewitem.cpp
# indra/newview/llcolorswatch.cpp
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llvoicewebrtc.cpp
# indra/newview/skins/default/colors.xml
# indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
# indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
# indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
# indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
# indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
# indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
# indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
# indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
# indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
# indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
# indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
# indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
# indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png
# indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png
# indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png
# indra/newview/skins/default/textures/build/Object_Cone_Selected.png
# indra/newview/skins/default/textures/build/Object_Cube_Selected.png
# indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png
# indra/newview/skins/default/textures/build/Object_Grass_Selected.png
# indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png
# indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png
# indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png
# indra/newview/skins/default/textures/build/Object_Prism_Selected.png
# indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png
# indra/newview/skins/default/textures/build/Object_Ring_Selected.png
# indra/newview/skins/default/textures/build/Object_Sphere_Selected.png
# indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png
# indra/newview/skins/default/textures/build/Object_Torus_Selected.png
# indra/newview/skins/default/textures/build/Object_Tree_Selected.png
# indra/newview/skins/default/textures/build/Object_Tube_Selected.png
# indra/newview/skins/default/textures/containers/Accordion_Selected.png
# indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
# indra/newview/skins/default/textures/icons/Info_Over.png
# indra/newview/skins/default/textures/icons/Inv_SysClosed.png
# indra/newview/skins/default/textures/icons/Inv_SysOpen.png
# indra/newview/skins/default/textures/icons/SL_Logo.png
# indra/newview/skins/default/textures/icons/back_arrow_off.png
# indra/newview/skins/default/textures/icons/back_arrow_over.png
# indra/newview/skins/default/textures/icons/back_arrow_press.png
# indra/newview/skins/default/textures/icons/see_me_online.png
# indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
# indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
# indra/newview/skins/default/textures/navbar/Row_Selection.png
# indra/newview/skins/default/textures/widgets/DropDown_On.png
# indra/newview/skins/default/textures/widgets/ListItem_Over.png
# indra/newview/skins/default/textures/widgets/ListItem_Select.png
# indra/newview/skins/default/textures/widgets/PushButton_On.png
# indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
# indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
# indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
# indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
# indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
# indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
# indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
# indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
# indra/newview/skins/default/textures/windows/Inspector_I.png
# indra/newview/skins/default/xui/en/floater_avatar_picker.xml
# indra/newview/skins/default/xui/en/floater_bulk_perms.xml
# indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
# indra/newview/skins/default/xui/en/floater_god_tools.xml
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/floater_preferences.xml
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/en/floater_world_map.xml
# indra/newview/skins/default/xui/en/fonts.xml
# indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
# indra/newview/skins/default/xui/en/panel_chat_header.xml
# indra/newview/skins/default/xui/en/panel_group_notices.xml
# indra/newview/skins/default/xui/en/panel_navigation_bar.xml
# indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_general.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
# indra/newview/skins/default/xui/en/panel_preferences_setup.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/skins/default/xui/en/panel_region_general.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/en/panel_status_bar.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
# indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
# indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
# indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
2026-03-04 14:36:51 +01:00
Mnikolenko Productengine
e9c4c1aacf
Merge branch 'release/2026.02' into maxim/flat-ui-fonts-update
...
# Conflicts:
# indra/newview/skins/default/xui/en/panel_preferences_general.xml
2026-02-25 13:45:30 +02:00
Maxim Nikolenko
b58e2e6958
UI controls adjustments and selection color update
...
* UI controls adjustments and selection color update
* Use constexpr instead of magic numbers
2026-02-09 19:21:27 +02:00
Ansariel
aadca76a91
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Python.cmake
# indra/llfilesystem/lldiskcache.cpp
# indra/llphysicsextensionsos/llconvexdecompositionvhacd.cpp
# indra/llui/llfloaterreg.h
# indra/newview/app_settings/settings.xml
# indra/newview/llinventorylistitem.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerwindow.cpp
2026-01-23 10:46:14 +01:00
Rye
ebde7519a8
Modernize std::type_info* usage in containers with std::type_index
...
Introduce operator<< for std::type_index for logging output
Utilize std::unordered_map inside llheteromap, llinitparam, llregistry
Remove unused Comparator template parameter from LLRegistry
2026-01-21 22:07:08 +02:00
Ansariel
6caaac8f67
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
2025-12-03 19:11:31 +01:00
Andrey Lihatskiy
d249e88f34
Build fix
2025-12-03 20:10:00 +02:00
Ansariel
01d36f60f6
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build.yaml
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/fsparticipantlist.h
2025-12-03 19:02:00 +01:00
Ansariel
b49c3a083b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-12-03 18:39:36 +01:00
Jonathan "Geenz" Goodman
6b866bc643
Merge pull request #5094 from secondlife/main
...
2025.08 -> Develop
2025-12-03 11:52:11 -05:00
Ansariel
0f96cf4e4e
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/workflows/build.yaml
# indra/newview/llappdelegate-objc.mm
# indra/newview/llappviewer.cpp
# indra/newview/llconversationlog.cpp
# indra/newview/llconversationloglistitem.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llspeakers.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/viewer_manifest.py
2025-11-22 13:07:03 +01:00
Zi Ree
2a6b5cbde5
Add menu entries for copying mentions URIs and inserting mentions into chats from the participants list or avatar URIs, even when the avatar does not come up in the @mention chooser.
2025-11-21 00:11:32 +01:00
Ansariel
51f7e7a7d7
Merge branch 'release/2025.08' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloatermarketplace.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/skins/default/xui/en/panel_preferences_move.xml
2025-11-17 23:37:55 +01:00
Maxim Nikolenko
6b7c6b1f8e
#4932 fix @mention being displayed twice if the name has a TM symbol
2025-11-10 19:29:50 +02:00
Andrey Kleshchev
d23379939c
#4879 An Emoji in a display name can affect text in chat
...
An emoji was spliting inlineview thus affecting displayed text.
2025-11-03 19:08:21 +02:00
Ansariel
18b014d336
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmessage/llcachename.cpp
# indra/newview/llfloateravatarpicker.cpp
# indra/newview/llviewermessage.cpp
2025-10-29 19:32:26 +01:00
Ansariel
1002a28e39
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-29 19:16:44 +01:00
Andrey Kleshchev
88aa94f9c4
#4879 An Emoji in a display name can affect text in chat
...
An emoji was spliting inlineview thus affecting displayed text.
2025-10-27 23:58:27 +02:00
Andrey Kleshchev
fa7cacc755
#4724 Fix performance problems with My Outfits - <FS:PP> Cherry pick for FIRE-35936
...
# Conflicts:
# indra/newview/lloutfitslist.cpp
2025-10-19 18:54:08 +02:00
Ansariel
2756f190b4
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloaterdisplayname.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2025-09-27 11:39:25 +02:00
Andrey Kleshchev
c2460e2dbd
#4724 Fix performance problems with My Outfits
2025-09-24 16:43:24 +03:00
Ansariel
5e5a3f4102
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltextbase.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/lleventpoll.cpp
2025-09-22 23:11:55 +02:00
Maxim Nikolenko
d7bd769129
#4715 disable ZoomIn an object item when the region is not connected to the current region
2025-09-22 15:46:04 +03:00
Ansariel
3a6929d53a
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/skins/default/xui/en/floater_settings_debug.xml
2025-09-09 20:01:27 +02:00
Andrey Kleshchev
d97cb0f18c
#4639 Crash at getDimensionsF32
2025-09-06 00:53:47 +03:00
Ansariel
62eb9fc935
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202506
2025-08-25 20:43:54 +02:00
Ansariel
8d220e4973
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/viewer_manifest.py
2025-08-25 20:42:31 +02:00
Jonathan "Geenz" Goodman
9f50a5b25b
Merge pull request #4603 from secondlife/release/2025.06
...
Update develop with latest 2025.06 changes.
2025-08-25 09:14:09 -04:00
Andrey Kleshchev
787b63f4c2
#3922 Crash on removeStringNoUndo
2025-08-20 22:32:42 +03:00
Ansariel
97a56ba909
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewermenu.h
2025-08-08 19:31:28 +02:00
Andrey Kleshchev
7f276f81ed
#4474 Zoom in to Object From Chat
...
Url based handler for compact chat
Normal handling for expanded chat.
2025-08-08 16:05:33 +03:00
Ansariel
a4e8af0dce
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/pull_request_template.md
# CONTRIBUTING.md
# indra/newview/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/res/viewerRes.rc
# indra/newview/skins/default/xui/de/panel_login_first.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_login_first.xml
# indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
# indra/newview/skins/default/xui/en/panel_status_bar.xml
# indra/newview/skins/default/xui/es/panel_login_first.xml
# indra/newview/skins/default/xui/fr/panel_login_first.xml
# indra/newview/skins/default/xui/it/panel_login_first.xml
# indra/newview/skins/default/xui/ja/panel_login_first.xml
# indra/newview/skins/default/xui/pl/panel_login_first.xml
# indra/newview/skins/default/xui/pt/panel_login_first.xml
# indra/newview/skins/default/xui/ru/panel_login_first.xml
# indra/newview/skins/default/xui/tr/panel_login_first.xml
# indra/newview/skins/default/xui/zh/panel_login_first.xml
# indra/newview/viewer_manifest.py
2025-07-30 10:52:39 +02:00
Maxim Nikolenko
590ad6747f
#4047 fix 'Show on Map' command for parcel URI links
2025-07-17 23:51:42 +03:00
Ansariel
524cb336dc
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-05-28 19:39:10 +02:00
Hecklezz
b97ac4a163
Reverts changes made to make search highlighted text font colour change
2025-05-24 00:01:44 +10:00
Ansariel
23416bed5e
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/icons/release/secondlife.icns
# indra/newview/llstartup.cpp
2025-05-23 12:09:47 +02:00
Ansariel
0360d8529a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerregion.h
2025-05-23 12:00:16 +02:00
Maxim Nikolenko
5b12428e65
#4132 fix name mentions sometimes not being highlighted
2025-05-22 19:53:53 +03:00
Hecklezz
deb8ef4cd6
Set font color of search highlighted text and fixed minor menu misalignment.
2025-05-18 00:00:37 +10:00
Ansariel
cf2f48de06
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llflatlistview.cpp
# indra/llui/llstyle.cpp
# indra/llui/llstyle.h
# indra/llui/lltextbase.cpp
# indra/llui/llurlmatch.cpp
# indra/llui/llurlmatch.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlist.h
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/colors.xml
2025-04-26 00:31:04 +02:00
Mnikolenko Productengine
d9468ecc59
#3758 disable editing of mention segment
2025-04-25 14:37:19 +03:00
Mnikolenko Productengine
17561e2ad1
#3758 show mention name in bubble chat
2025-04-23 21:04:47 +03:00
Mnikolenko Productengine
3e46d707a2
#3758 initial chat mention support
2025-04-18 19:59:17 +03:00
Mnikolenko Productengine
90c7684112
#3758 add support for highlighted segments
2025-04-18 19:59:09 +03:00