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
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
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
c2460e2dbd
#4724 Fix performance problems with My Outfits
2025-09-24 16:43:24 +03:00
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
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
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
d97cb0f18c
#4639 Crash at getDimensionsF32
2025-09-06 00:53:47 +03:00
62eb9fc935
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202506
2025-08-25 20:43:54 +02:00
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
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
787b63f4c2
#3922 Crash on removeStringNoUndo
2025-08-20 22:32:42 +03:00
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
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
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
590ad6747f
#4047 fix 'Show on Map' command for parcel URI links
2025-07-17 23:51:42 +03:00
524cb336dc
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-05-28 19:39:10 +02:00
b97ac4a163
Reverts changes made to make search highlighted text font colour change
2025-05-24 00:01:44 +10:00
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
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
5b12428e65
#4132 fix name mentions sometimes not being highlighted
2025-05-22 19:53:53 +03:00
deb8ef4cd6
Set font color of search highlighted text and fixed minor menu misalignment.
2025-05-18 00:00:37 +10:00
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
d9468ecc59
#3758 disable editing of mention segment
2025-04-25 14:37:19 +03:00
17561e2ad1
#3758 show mention name in bubble chat
2025-04-23 21:04:47 +03:00
3e46d707a2
#3758 initial chat mention support
2025-04-18 19:59:17 +03:00
90c7684112
#3758 add support for highlighted segments
2025-04-18 19:59:09 +03:00
62e5fffd8e
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/lldrawpooltree.cpp
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/colors.xml
2025-03-23 12:29:33 +01:00
d2dd881a5c
#3778 #3654 Split text and background selection colors
2025-03-21 09:39:25 +02:00
83d74614cf
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2025-01-22 00:42:22 +01:00
75a01bf428
#3319 Crash at LLInitParam::Param::setProvided
...
Most crashes are related to LLStyle, log analysis suggests that it might
be a number of different issues, including memory and disk issues.
Just avoid recreating expensive LLStyle without reason.
2025-01-20 12:40:05 +02:00
b727a5e73c
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llglsandbox.cpp
# indra/newview/llphysicsshapebuilderutil.cpp
2024-09-19 01:25:26 +02:00
27b8e6d576
#2408 The long covenant with emojis significantly slows down some operations in the viewer
2024-09-18 17:13:59 +02:00
64b6587eec
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
2024-09-09 19:48:04 +02:00
4a00280b89
viewer#2411 Use font buffer for inventory
2024-09-07 00:32:18 +03:00
10f176c925
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/textures/map_avatar_you_32.tga
2024-09-05 22:42:39 +02:00
494ac09216
viewer#2411 Confine font vertex buffers to static text segments
...
Collection of vertex buffers happens to often with segmented text.
2024-09-05 06:55:53 +03:00
238a2a64b3
viewer#2411 Use font buffer in text segments
2024-09-05 06:55:53 +03:00
80f9aaa46e
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Audio.cmake
# indra/llui/llconsole.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llhudnametag.cpp
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llscripteditor.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerchat.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerparceloverlay.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvosurfacepatch.cpp
2024-08-05 20:10:02 +02:00
409b9eebe1
Fix chat text segments not dynamically updating when colors changed in preferences
2024-08-04 23:11:57 -04:00
9e777e1109
Fix various issues with text segments not updating UI color
2024-08-04 23:11:57 -04:00
456d013ba8
Fix various issues with ui elements not updating colors dynamically
2024-08-04 23:11:57 -04:00
c4e921828a
Optimization and cleanup of various color finds during draw
2024-08-04 23:11:57 -04:00
088cc2ea35
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
9fdca96f8b
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-08 20:27:14 +02:00
591c75ebaf
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llmath/llvolume.cpp
# indra/llmessage/llcorehttputil.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/darwin/apple-notarize.sh
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/viewer_manifest.py
2024-06-10 21:53:31 +02:00
4b52dd754b
Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed
2024-06-10 19:30:17 +03:00
c0fad3028f
Re-enable compiler warnings C4018, C4100, C4231 and C4506
2024-06-10 16:42:43 +02:00
a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
Ansariel