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
4e78b4c9fe
#4651 Distinguish logout crashes from other crashes
2025-11-06 21:37:10 +02:00
574dc5b65a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-31 19:25:58 +01:00
cc3bae406c
FIRE-36022 - Removing my USB headset crashes entire viewer - FMOD fixes
...
Added three FMOD specific changes based upon reading the FMOD manual.
See: https://www.fmod.com/docs/2.00/api/platforms-win.html
As well, switched to using the FMOD log version of the library and found one error on the get advanced features.
Also, the call back method should be a static method. Just being cautious.
2025-10-28 23:30:18 -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
82e431e090
Merge remote-tracking branch 'origin/release/2025.07' into geenz/2025.07-develop
2025-09-18 15:23:26 -04:00
892fb2d6e2
#4651 Fix marker presence check
2025-09-16 21:27:58 +03:00
3b3c85d1f3
#4651 Try distinguishing freezes from crashes
2025-09-15 11:16:24 +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
ba30737d8f
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-20 18:04:55 -04: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
5291fc252a
#4374 update icon for title bar
2025-07-26 01:20:22 +03:00
fe4f85e587
Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop
2025-05-28 11:52:16 -04: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
0d25562014
FIRE-34977 - Reduce Sim crossing overhead causing pauses
...
The purge thread should be the only thread recalculating cache usage. This removes the directory scan from the critial path where it would occasionally trigger due to aligned timers (exacerbated by high rates of region crossing)
2025-05-19 19:53:44 +01:00
6f2974a669
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-05-14 21:15:25 +02:00
223f7d84f2
Update bugsplat attributes to new format.
2025-05-14 00:03:54 +01:00
f2a92c5420
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-05-08 12:15:14 +02:00
622110c5e4
Fixes fullscreen mode in Windows 11 24H2
2025-05-06 03:40:48 +10:00
efdb86dcbb
Fixes fullscreen mode in Windows 11 24H2
2025-05-05 20:27:31 +03:00
52cca995cc
Merge branch 'release/2025.04' into rye/forevermac
2025-04-15 13:55:01 -04:00
6487febff0
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/lldxhardware.cpp
# indra/llwindow/lldxhardware.h
# indra/newview/llappviewerwin32.cpp
# indra/newview/llviewerdisplay.cpp
2025-04-10 18:50:12 +02:00
2da46c3830
#3575 Clean up obsolete VRAM detectin logic
2025-04-05 09:28:26 +03:00
99e1699479
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llwearable.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
2025-03-27 19:36:45 +01:00
8705c16cb2
#3643 Make sure attribute names match between OSs
...
On Mac spaces aren't permitted.
2025-03-25 22:24:02 +02:00
e0d14e02e1
Merge branch 'release/2025.03' into rye/forevermac
2025-03-11 22:44:49 -04:00
d19e6abc5e
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
# indra/newview/skins/default/xui/it/floater_avatar_textures.xml
# indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
# indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
# indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
2025-03-01 01:09:19 +01:00
454d5b4871
#3591 Reprot SEH directly to bugsplat
...
Rethrowing SEH via std::exception results ina callstack that ends at
rethrow.
2025-02-26 21:50:46 +02:00
179b29252d
Rework windows to use zc:wchar_t for better c++ conformance and compatibility with modern libraries
2025-02-11 05:55:37 -05: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
1c6bbce5d7
A few more BugSplat related tweaks
2025-01-04 01:08:51 +00:00
c8d57c659c
Static attributes may not be ready until we've started fully.
...
But we still want to try to capture some of them before startup in case of an early crash.
2024-12-28 19:14:27 +00:00
36e454787b
Fixup the FS tagging here.
2024-12-19 18:17:28 +00:00
4e581f0b0b
remove deprecated bugsplat attribute handling.
2024-12-19 17:40:21 +00:00
267512126d
Remove wide-strings as they are more trouble than they are worth
...
these were only ever wide strings because the BS API for windows had that. This is now written to XML.
2024-12-19 17:34:23 +00:00
2545ffd25a
Add searchable/filterable attributes to BugSplat
...
New metadata file method.
Like the previous method that only aplied to windows this is so far only available on PC and XBox BugSplat APIS. Unmlike the deprecated version, it is expected to be added to MacOS and crashpad "soon".
2024-12-19 17:32:38 +00:00
8ed4989c34
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llvoicevivox.cpp
2024-11-07 18:02:38 +01:00
3eb193f752
Slightly better crash logging
2024-11-01 17:54:05 +02:00
02680c6a8f
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llxml/llxmltree.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llfloaterworldmap.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroup.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/viewer_manifest.py
2024-07-30 12:32:41 +02:00
c7c7342ed3
Update boost to 1.85 and fix deprecation warnings
2024-07-29 08:20:32 +03: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
499a717f62
Remove ancient MSVC7 code
2024-07-08 20:46:45 +02:00
75aa83aab6
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmessage/lltemplatemessagedispatcher.cpp
# indra/newview/llappviewer.cpp
2024-07-06 12:42:19 +02:00
9ddf64c651
#1931 BugSplat Crash: SecondLifeViewer!LLRenderTarget::release(387)
2024-07-06 08:38:17 +02:00
45ab5c68ee
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llgl.h
# indra/newview/fspanelface.cpp
# indra/newview/fspanelface.h
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llheroprobemanager.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvocache.cpp
# indra/newview/vjlocalmesh.cpp
2024-06-21 19:58:00 +02:00
684bc1d1ea
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/llcommon/llsys.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/logcontrol.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llspeakers.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvocache.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
2024-06-21 19:46:51 +02:00
e4fd1bd71e
viewer#1808 Use bugsplat's setAttribute for app state
2024-06-21 11:46:25 +03:00
174b934a13
Revised VRAM override for cross-platform
...
relocated for x-platform (tested on Win and Linux, Mac TBC)
2024-06-18 01:12:32 +01: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
Ansariel