89b4879627
Merge remote-tracking branch 'origin/release/gltf-maint2' into release/materials_featurette
2024-03-05 11:11:54 -08:00
78ce375dda
SL-17896 Don't crash silently if files are missing or out of memory
...
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
2024-03-05 00:29:35 +02:00
78140786ce
#689 Fix for mirror stuttering.
2024-02-01 10:18:17 -08:00
373b06398c
Merge remote-tracking branch 'origin/release/materials_featurette' into DRTVWR-583
2024-01-24 14:37:33 -08:00
6dd260c369
Merge branch 'release/materials_featurette' into DRTVWR-592
2024-01-19 11:36:56 -06:00
422c006e32
SL-20702 Remove ALM info in About
2023-12-15 18:02:55 +02:00
d1c0a5b840
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
673b3309dd
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-10-25 16:12:13 -07:00
4c6ae49c88
Merge branch 'main' into DRTVWR-587-maint-V
...
# Conflicts:
# autobuild.xml
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/viewer_manifest.py
2023-10-25 21:28:26 +03: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
bd9c0a2e65
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-10-16 08:48:50 -07:00
a91f08ba84
Merge branch 'DRTVWR-559' into DRTVWR-592
2023-10-13 14:02:51 -07:00
94d8f669ac
DRTVWR-592: Add debug options LocalTerrainAssetN. Fix PBR terrain texture flickering
2023-10-13 09:58:13 -07:00
c26123e11f
SL-18837: Merge branch 'main' of secondlife/viewer into actions
2023-10-04 08:45:47 -04:00
d4123ec30d
Merge branch 'main' into DRTVWR-587-maint-V
...
# Conflicts:
# indra/newview/llinventorymodel.cpp
# indra/newview/llvovolume.cpp
2023-10-03 19:25:19 +03: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
73870cb0b4
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-09-25 09:27:49 -07:00
74940194fa
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into davep/SL-19842
2023-09-11 11:51:20 -05:00
4192cfc1ea
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-09-09 14:52:06 -07: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
c5bfe86915
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-08-29 03:40:10 -07: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
d08859f3f4
Merge branch 'main' into DRTVWR-587-maint-V
...
# Conflicts:
# autobuild.xml
2023-08-23 22:28:01 +03:00
c6d5f11f63
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-08-23 12:26:14 -07:00
d5845fe3e7
Latest updates to the hero probe manager.
...
DRTVWR-583
2023-08-18 21:47:40 -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
4c848c8258
Merge branch 'main' (DRTVWR-580) into DRTVWR-587-maint-V
2023-07-17 23:18:04 +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
4c89ad5586
SL-19306 A method of displaying user-customized keybindings in user-visible text
2023-07-17 15:46:18 +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
Brad Linden