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
8a55580fc9
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/cmake/LLPhysicsExtensions.cmake
# indra/newview/llvoicewebrtc.cpp
2025-11-17 23:26:11 +01:00
cd8d47c9f3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-11-12 18:44:30 +01:00
bbd3ee8018
#4920 fix group categories not being displayed when one below is expanded (FS:TJ- Cherry-pick to fix FIRE-36078)
2025-11-09 17:48:53 +10:00
3694df79bf
#4656 Don't scroll to a child that is already in view and can not fit
2025-11-06 20:15:28 +02: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
6979b1ff50
#4920 fix group categories not being displayed when one below is expanded
2025-11-03 19:05:46 +02:00
1002a28e39
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-29 19:16:44 +01:00
3620dfdd35
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-29 18:40:12 +01:00
d4fd72e5ac
Add an option o disable auto-completion when typing @ mentions in chat
2025-10-23 16:33:22 +02:00
f3bce39d28
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llfile.cpp
# indra/llui/llviewereventrecorder.cpp
2025-10-21 00:24:37 +02:00
e12958161c
Improve LLFile to be consistent between Windows and Linux/Mac
2025-10-21 00:50:27 +03:00
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
5c03f284af
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/APR.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/newview/llsurface.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/viewer_manifest.py
2025-10-18 13:01:08 +02:00
36217e7cb3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llwebrtc/llwebrtc.cpp
# indra/llwebrtc/llwebrtc_impl.h
# indra/newview/llvoicewebrtc.cpp
# indra/newview/llvoicewebrtc.h
2025-10-18 12:33:24 +02:00
06e8393846
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-16 22:48:43 +02:00
b011263b60
#3379 Fix callback cleanup
...
Instead of marking as 0, mark for cleanup
2025-10-16 20:14:47 +03:00
6cdd9cff70
Fix C26444 compiler warning (creating unnamed RAII instances that could lead to unintended behavior)
2025-10-16 18:40:23 +03:00
167b7bae62
#3263 Repeat Notification Noise on Find Emoji Floater
2025-10-15 11:21:25 +03:00
ad51dd5606
Fix C26444 compiler warning (creating unnamed RAII instances that can lead to undefined behavior)
2025-10-14 10:13:09 +02:00
e7b3d68cab
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLPhysicsExtensions.cmake
# indra/llprimitive/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/floater_marketplace.xml
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/floater_search.xml
2025-10-11 18:51:03 +02:00
503affdc97
#vp484 Crash in LLFolderViewFolder::setOpen
2025-10-01 17:54:46 +03:00
b84ea39dba
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/lltoolbarview.cpp
2025-09-30 17:52:52 +02:00
ac2213b97b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507
2025-09-30 17:44:28 +02:00
a41bf0f717
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-09-30 17:27:19 +02:00
3665dc24f4
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm into texture-changes-reverted
2025-09-30 16:38:47 +02:00
d5e8f51b61
#4750 Crash in LLToolBarView::handleDropTool
2025-09-29 22:20:02 +03: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
ecbf70877e
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llimagej2coj/llimagej2coj.cpp
2025-09-27 10:55:28 +02:00
8976d69dba
#4723 Fix emoji warnings and missing emojis
2025-09-24 23:43:33 +03:00
c2460e2dbd
#4724 Fix performance problems with My Outfits
2025-09-24 16:43:24 +03:00
312d077884
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llimagej2coj/llimagej2coj.cpp
2025-09-23 09:58:52 +02: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
b911b63398
Remove Nicky's original outfit list performance fix that now act counterproductive and completely ignores the max processing time of the idle callback update
2025-09-20 16:55:21 +02:00
e918d240fd
#4679 Logging for crash on updateMenuOptions
...
Logs say that viewer closed settings picker and immediately crashed
Yet callstack indicates that some inventory was right clicked, which
shouldn't be possible if picker already closed.
May be some click is closing the picker and opens menu at the same time,
but it's better to gather information first.
2025-09-19 12:29:27 +03:00
90fa3b4672
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507
2025-09-10 23:38:50 +02:00
dd1113ba2b
Merge branch 'release/2025.07' into project/mac_universal
2025-09-10 13:29:51 -04: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
633892ce7d
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# scripts/packages-formatter.py
2025-09-09 19:53:39 +02:00
efe97b9940
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/cmake/00-Common.cmake
# scripts/packages-formatter.py
2025-09-09 19:52:09 +02:00
d97cb0f18c
#4639 Crash at getDimensionsF32
2025-09-06 00:53:47 +03:00
b99cf9fb86
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
2025-09-05 14:55:37 +02:00
06f2a1b79a
Merge branch 'master' into feature/conversations_opacity_options
2025-09-04 19:11:52 +10:00
17f0ef8f99
fix for macOS build
2025-09-03 23:40:23 +02:00
8383b89390
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm into texture-changes-reverted
...
# Conflicts:
# indra/newview/llviewerobject.cpp
2025-08-31 12:18:41 +02:00
96ff5f8e70
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-28 00:53:15 -04:00
882fc91b0c
Added missing opacity overrides for filter editors in the conversations floater
2025-08-26 22:05:06 +10:00
b4a7ef835c
Refactored Conversations opacity override and made the callback to override transparency generic
2025-08-26 22:05:06 +10:00
da395c715c
Implemented seperate Conversations opacity options
2025-08-26 22:05:03 +10:00
Ansariel