Commit Graph

5562 Commits (c513ebb777b5345416683404454125cd94de838c)

Author SHA1 Message Date
Beq bd3acb8547 remove some pointless and distracting profiling 2025-05-01 16:18:31 +01:00
Beq b460297081 Revert "Merge pull request #103 from Tampa/FIRE-34775"
This reverts commit 0a1b7789c7, reversing
changes made to e001d0f6e1.
2025-04-16 22:33:12 +01:00
Beq Janus 0a1b7789c7
Merge pull request #103 from Tampa/FIRE-34775
FIRE-34775: For OpenSim switch back to PST/PDT
2025-04-16 21:56:31 +01:00
Vincent Sylvester 6ac30b3dbc FIRE-34775: For OpenSim switch back to PST/PDT 2025-04-09 05:15:22 +02:00
Ansariel 1243de5d84 Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-04-03 23:08:03 +02:00
Andrey Kleshchev e671cb54fe #3795 Crash at getVolatileAPRPool() 2025-03-30 13:38:34 +03:00
Ansariel 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
Andrey Kleshchev d484fff77d #3596 Don't supress exceptions in WorkQueue
We need those to know about problems.
2025-03-25 22:24:02 +02:00
Ansariel 750099db68 Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llmessage/llproxy.cpp
#	indra/llui/llfolderviewitem.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llviewerprecompiledheaders.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/floater_world_map.xml
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
#	indra/newview/viewer_manifest.py
2025-03-12 19:31:51 +01:00
Andrey Kleshchev 7e9e5bf872 #3591 Restructure SE to not catch LLContinueError
It was reporting shutdown as crashes to bugsplat
2025-03-12 17:29:42 +02:00
Bennett Goble 851039cf4e Add timestamp to snapshot file names
This changeset adds a timestamp in the format of "YYYY-MM-DD_HHSS" to
snapshot filenames. This is useful for understanding when a snapshot was
taken, chronologically ordering files, and is less confusing than the
current method of adding a number to the snapshot name, as it does not
result in interleaving of old and new snapshots inside a directory.
2025-03-11 22:25:33 +02:00
Ansariel 98a96cf033 Revert "tentative workaround for gcc c++20 std::lerp clash"
This reverts commit 19999b5858.
2025-03-08 23:46:30 +01:00
Beq 19999b5858 tentative workaround for gcc c++20 std::lerp clash
We may revert this for a better less dispruptive solution if we can find one.
2025-03-08 17:19:19 +00:00
Ansariel 6a10f6f20a Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llappdelegate-objc.mm
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
2025-03-05 10:12:03 +01:00
Andrey Kleshchev ed394cd5a0 #3591 rethrow should be mac specific
Jumped the gun a bit, since reportCrashToBugsplat is OS specific,
restore rethrow for other systems.
2025-03-04 17:23:05 +02:00
Ansariel 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
Andrey Kleshchev 39610cbfb3 #3591 Remove now pointless rethrow 2025-02-26 21:50:46 +02:00
Andrey Kleshchev 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
Ansariel 5bf1f485f3 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
2025-02-13 21:24:29 +01:00
Andrey Lihatskiy ddbe1ff981 Fix xcode16 build errors 2025-02-13 17:30:08 +02:00
Ansariel dac7725c40 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_setup.xml
#	indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
2025-02-03 16:11:21 +01:00
Andrey Kleshchev fd577e3bfc #3400 Reimplement LLError marker for crash statistics 2025-01-30 01:35:49 +02:00
Ansariel 8758495d11 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llerror.cpp
#	indra/llmath/v4math.h
#	indra/llui/lltransutil.cpp
#	indra/newview/llface.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llvovolume.cpp
2025-01-26 00:07:35 +01:00
Andrey Kleshchev ad375d6116 viewer#3088 Report out of memory as a separate 'category' 2025-01-22 16:06:30 +02:00
Ansariel c53bc7e74f Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llviewercontrol.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
2024-12-15 21:44:14 +01:00
Dave Parks eff46262c8
#2590 Radeon mac optimization pass (#3277)
- Skip updating of reflection probes that are not the default probe when probe coverage is set to "None"
- enable RenderAppleUseMultGL and disable occlusion culling on Macs with AMD GPUs
- Reduce the number of texture decode threads on Macs with intel cpus.
- Move texture deletion to LLImageGL::updateClass and prevent textures from staying resident in vram longer than 3 frames
- Disable SSAO by default on Macs with intel CPUs
2024-12-12 15:46:01 -06:00
Ansariel 2e4c9f73b4 Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2024-11-28 00:19:30 +01:00
Nat Goodspeed a13ae880af Add diagnostic output for LLProcess event history failure. 2024-11-27 13:41:52 -08:00
Ansariel 1531b28979 Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/pipeline.cpp
2024-11-13 11:31:28 +01:00
Brad Linden 13c0708cc7
Attempt at fix for secondlife/viewer#2745 mac crash when app is in background (#3063)
once again disable RenderAppleUseMultGL and RenderGLMultiThreadedMedia
also added a tiny fix for missing processor vendor in crash reports
2024-11-08 14:16:23 -08:00
Ansariel 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
Andrey Kleshchev 55732f7343 viewer#3010 Fix malfunctioning json array to llsd parsing
Was reserving 'size' elements, then appending more elements on top.
2024-11-06 00:51:20 +02:00
Ansariel 3de628f1ce Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-10-18 10:17:29 +02:00
Brad Linden 92e25ef738 Attempt to get better file/line info for LL_ERRS crashes in bugsplat. (#2447)
secondlife/viewer#2445
2024-10-17 01:35:23 +01:00
Beq 3432012aef Revert "Attempt to get better file/line info for LL_ERRS..." needs new tpv_havok
This reverts commit 205e259d42.
2024-10-05 18:32:50 +01:00
Brad Linden 205e259d42 Attempt to get better file/line info for LL_ERRS crahses in bugsplat. (#2447)
secondlife/viewer#2445
2024-10-05 00:12:28 +01:00
Ansariel 193fb1627f Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewermedia.cpp
2024-09-19 23:04:19 +02:00
nat-goodspeed a7d5d4cf84
Merge pull request #2610 from secondlife/frame-profile-json
Make Develop->Render Tests->Frame Profile dump JSON to a file too.
2024-09-19 14:48:14 -04:00
Andrey Kleshchev 25969b330e viewer#2608 Crash at LLSnapshotLivePreview::getFormattedImage 2024-09-19 20:56:10 +03:00
Nat Goodspeed be40936881 trailing spaces from other branches 2024-09-19 12:40:56 -04:00
Nat Goodspeed 8342d68ea9 Merge branch 'develop' into frame-profile-json 2024-09-19 11:48:33 -04:00
Brad Linden c5a2235e7a
Turn off sLogInSignal to avoid crashing. (#2607)
fixes secondlife/viewer#2566
2024-09-18 18:16:24 -07:00
Nat Goodspeed f0300cf8b3 Add hexdump.h with iostream manipulators to dump a byte range as hex
or to produce readable text from a mix of printing and nonprinting ASCII
characters.

(cherry picked from commit 01a59bab1a4b7c4645271a21cfaadc3735b6029c)
2024-09-18 17:17:59 -04:00
Nat Goodspeed 725e1b7d6f Ditch trailing space. 2024-09-18 16:56:10 -04:00
Nat Goodspeed 837a6e04d8 Give our fsyspath an operator std::string() conversion method.
This is redundant (but harmless) on a Posix system, but it fills a missing
puzzle piece on Windows. The point of fsyspath is to be able to interchange
freely between fsyspath and std::string. Existing fsyspath could be
constructed and assigned from std::string, and we could explicitly call its
string() method to get a std::string, but an implicit fsyspath-to-string
conversion that worked on Posix would trip us up on Windows. Fix that.

(cherry picked from commit fbeff6d8052d4b614a0a2c8ebaf35b45379ab578)
2024-09-18 16:52:45 -04:00
Nat Goodspeed e829828dcd Introduce fsyspath subclass of std::filesystem::path.
Our std::strings are UTF-8 encoded, so conversion from std::string to
std::filesystem::path must use UTF-8 decoding. The native Windows
std::filesystem::path constructor and assignment operator accepting
std::string use "native narrow encoding," which mangles path strings
containing UTF-8 encoded non-ASCII characters.

fsyspath's std::string constructor and assignment operator explicitly engage
std::filesystem::u8path() to handle encoding. u8path() is deprecated in C++20,
but once we adapt fsyspath's conversion to C++20 conventions, consuming code
need not be modified.

(cherry picked from commit e399b02e3306a249cb161f07cac578d3f2617bab)
2024-09-18 16:52:08 -04:00
Nat Goodspeed e6d0138a6a Add LLFloaterAbout info (esp. GPU info) to Frame Profile stats dump
With the About info added, `getProfileStatsContext()` need not redundantly add
`"channel"`, `"version"` or `"region"`.

Slightly improve the efficiency of `LlsdToJson()` and `LlsdFromJson()` by
preallocating the known size of the source array or map. (Unfortunately the C++
`LLSD` class offers us no way to preallocate a map.)

In `LLAppViewer::getViewerInfo()`, avoid immediate successive calls to
`gAgent.getRegion()`.

(cherry picked from commit f4b65638879c10c832b3bb8448f82001106ffd11)
2024-09-18 14:09:34 -04:00
Ansariel 1cca913ba7 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/CMakeLists.txt
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/llmodelloader.cpp
#	indra/llrender/llgl.h
#	indra/llrender/llrender.h
#	indra/llui/llurlentry.cpp
#	indra/llui/llurlentry.h
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llvoavatar.cpp
2024-09-13 18:54:12 +02:00
Ansariel Hiller 74205607b7
Clean up Windows build (#2562)
* APR_DECLARE_STATIC and APU_DECLARE_STATIC gets already defined in APR.cmake
* Move both _CRT_SECURE_NO_WARNINGS and _WINSOCK_DEPRECATED_NO_WARNINGS definitions to 00-Common.cmake
* Always define WIN32_LEAN_AND_MEAN and include subset of Windows API by default
* Remove llwin32headerslean.h and remove unnecessary WIN32_LEAN_AND_MEAN definition handling in llwin32headers.h
* Clean up includes of Windows API headers
* Get rid of workaround to link against IPHLPAPI.lib in lluuid.cpp - this seems to have been an issue in the past that has been fixed
2024-09-13 17:28:48 +03:00
Brad Linden a3f6f98f1b
Merge pull request #2561 from secondlife/brad/2553-about-sl-crash-locale-init
secondlife/viewer#2553 about sl crash locale init
2024-09-12 15:27:26 -07:00