673b3309dd
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-10-25 16:12:13 -07:00
117f07e5a4
SL-18837: Avoid stuffing build number into 32-bit int.
...
Even though LLVersionInfo::getBuild() already returns a 64-bit int, various
consumers assumed it could fit into 32 bits. It was especially bad to pass it
to a classic C style varargs function. Only on a little-endian CPU, and only
because it was the last argument, the damage was limited to truncation --
instead of arbitrary undefined behavior.
Where the consumer doesn't support 64-bit ints, pass as string instead.
2023-10-17 06:33:05 -04:00
c26123e11f
SL-18837: Merge branch 'main' of secondlife/viewer into actions
2023-10-04 08:45:47 -04:00
7d50a51434
Merge branch 'main' (DRTVWR-567) into DRTVWR-559
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-03 19:00:33 +03:00
74940194fa
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into davep/SL-19842
2023-09-11 11:51:20 -05:00
b8e6777439
SL-18837: Merge branch 'main' into actions
2023-09-07 11:15:56 -04:00
a44959c00a
SL-19664 Crash in LLAppViewer::initStrings(2985) - log extended info
2023-09-01 20:20:31 +02:00
200696f25c
SL-19664 Crash in LLAppViewer::initStrings - make the error message more informative
2023-08-30 17:03:13 +02:00
455bbcf742
SL-20229 Add GenericStreamingMessage and use it to receive GLTF material overrides
2023-08-29 16:42:55 -05:00
3d73a10da3
Merge branch main (DRTVWR-582) into DRTVWR-567
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-23 22:40:17 +03:00
c6d5f11f63
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-08-23 12:26:14 -07:00
25330b47f9
SL-18837: Merge branch 'main' of secondlife/viewer into actions
2023-07-21 11:27:55 -04:00
f975cfd736
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-07-17 13:37:03 -07:00
acf82867b6
Merge branch 'main' (DRTVWR-580) into DRTVWR-567
...
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
2023-07-17 23:34:59 +03:00
07ff9a5d67
Merge branch 'main' into DRTVWR-582-maint-U
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
2023-07-17 23:17:29 +03:00
3c63cc9c55
SL-18837: Make LLVersionInfo::getBuild() S64 for GitHub run IDs.
2023-06-28 18:36:51 -04:00
21b67896e9
SL-19909 Fix for reflection probes on vehicles blocking mouse clicks. Incidental instrumentation and decruft.
2023-06-26 15:37:18 -05:00
27ee831e38
SL-19744: Remove LLErrorThread and LLAppViewer::handleViewerCrash()
2023-05-23 04:28:58 +03:00
87bda55268
Add a binary cache for compiled shaders using glProgramBinary ( #216 )
...
* Add a binary cache for compiled shaders using glProgramBinary
* Add additional sanity checking to shader binary save and load, hook up cache clear and menu option
* Fix default init of shader cache data struct and clear gl errors before glGetError calls
---------
Co-authored-by: RunitaiLinden <davep@lindenlab.com>
2023-05-17 18:30:27 -05:00
53ed0ec70c
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# doc/contributions.txt
2023-05-17 23:57:11 +03:00
2f44377b3e
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-05-17 11:17:48 -07:00
033b04f388
Merge branch 'main' into DRTVWR-582-maint-U
...
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
2023-05-17 18:05:05 +03:00
e3f9244375
SL-19710 Fix for deadlock in LLPerfStats. Move General thread initialization to earlier in session (unrelated).
2023-05-12 18:09:35 -05:00
8077d33ba0
SL-19656 Remove LLPerfStats thread and fold into General thread. Hook avatar GPU time into LLPerfStats. Incidental decruft.
2023-05-11 13:20:34 -05:00
a9c64940cb
Merge pull request #205 from secondlife/sl-19676-360mode-stats
...
sl-19676 - Stats on updates and scene loading
2023-05-09 09:27:53 -07:00
a22d62e8ed
Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-559
2023-05-04 11:39:03 -07:00
e8c1a18105
First work on sl-19676 - Stats on updates
2023-05-04 16:52:35 +01:00
3c77c1b90f
DRTVWR-575: Replace some LLSDArray() usage with llsd::array().
...
It seems newer compilers have a different interpretation of exactly when to
engage LLSDArray's copy constructor. In particular, this assignment:
some_LLSD_map[key] = LLSDArray(...)(...)...;
used to convert the LLSDArray object directly to LLSD; now it first calls the
custom copy constructor, which embeds the intended array within an outer array
before assigning it into the containing map.
The newer llsd::array() function avoids that problem because what it returns
is already an LLSD object.
Taking inventory of LLSDArray assignments of that form turned up a number of
workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is
both simpler and more readable.
Tip of the hat to Chorazinallen for surfacing this issue!
(cherry picked from commit bb718155bd
2023-05-03 12:31:42 -04:00
ade8c96e5c
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llappviewer.cpp
2023-05-02 17:57:11 +03:00
ff8dcc23bf
Merge branch 'main' into DRTVWR-577-maint-S
2023-05-02 17:39:37 +03:00
10b2ec92ec
More merge cleanup after DRTVWR-559 & DRTVWR-539 merge. (thanks Ansariel)
2023-04-27 18:02:48 -07:00
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07:00
7c831d115b
SL-18458 Make LLVOCache the one source of truth on most recently received overrides. ( #147 )
2023-04-03 15:22:40 -07:00
41d24952ff
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/llfloateravatarrendersettings.cpp
2023-03-31 17:17:21 +03:00
198cd4df09
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-30 14:09:50 +03:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
5217e6bfb7
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-30 00:25:16 +03:00
dca3c83cd9
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-03-20 01:23:16 +02:00
bd4b03de8b
DRTVWR-559 Fix for assert in LLVertexBuffer, incidental decruft.
2023-03-10 13:33:36 -06:00
6a260bb3f0
SL-19108 Rename outfit snapshot floater
2023-02-21 00:24:23 +02:00
8032b2d72e
SL-19204 Crash at removeObserver
...
A lot of reports about crashes in voice's removeObserver with no indication of the cause, all MAC specific. By this point terminate should have been called and mVoiceModule should be null, yet callstaks suggest it isn't.
Commit clears LLVoiceClient beforehand to avoid the issue entirely, but issue lies elsewhere and 'voice' crash is just a symptom.
2023-02-17 00:51:18 +02:00
6c54c9f8a9
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
2023-02-09 22:33:52 +02:00
2f4902967a
Merge branch 'xcode-14.1' into andreyk/SL-19134
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
2023-02-03 22:59:50 +02:00
e7ba1753d2
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-02-03 01:46:01 +02:00
5fabfa50d7
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-02-02 12:11:40 -08:00
7a5381b39f
Merge branch 'main' into DRTVWR-573-maint-R
2023-02-02 21:51:07 +02:00
4c364dc07e
SL-14318 MacOS __write_nocancel crash
...
Multiple instances of viewer could write to the same uuid.inv file at the same time.
2023-01-20 00:22:18 +02:00
7bd9d21e19
Optimizations, decruft, and intel compatibility pass ( #53 )
...
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2023-01-19 09:13:45 -06:00
484e3b6213
Merge branch 'xcode-14.1' into DRTVWR-577-maint-S
...
D577 should have picked part of the changes from contribute branch, picking up the rest for the sake of branch specific crash fixes
2023-01-16 20:07:02 +02:00
bb718155bd
DRTVWR-575: Replace some LLSDArray() usage with llsd::array().
...
It seems newer compilers have a different interpretation of exactly when to
engage LLSDArray's copy constructor. In particular, this assignment:
some_LLSD_map[key] = LLSDArray(...)(...)...;
used to convert the LLSDArray object directly to LLSD; now it first calls the
custom copy constructor, which embeds the intended array within an outer array
before assigning it into the containing map.
The newer llsd::array() function avoids that problem because what it returns
is already an LLSD object.
Taking inventory of LLSDArray assignments of that form turned up a number of
workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is
both simpler and more readable.
Tip of the hat to Chorazinallen for surfacing this issue!
2023-01-03 18:06:45 -05:00
Brad Linden