summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2023-09-10Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-07SL-18837: Merge branch 'main' into actionsNat Goodspeed
2023-09-01SL-19664 Crash in LLAppViewer::initStrings(2985) - log extended infoAlexander Gavriliuk
2023-09-01SL-19664 Crash in LLAppViewer::initStrings(2985) - log extended infoAlexander Gavriliuk
2023-09-01SL-19664 Crash in LLAppViewer::initStrings - make the error message more ↵Alexander Gavriliuk
informative
2023-08-30SL-19664 Crash in LLAppViewer::initStrings - make the error message more ↵Alexander Gavriliuk
informative
2023-08-29SL-20229 Add GenericStreamingMessage and use it to receive GLTF material ↵RunitaiLinden
overrides
2023-08-24Merge tag '6.6.14-release'Erik Kundiman
source for viewer 6.6.14.581101
2023-08-23Merge branch main (DRTVWR-582) into DRTVWR-567Andrey Kleshchev
# 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-23Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2023-08-23Merge branch 'main' into DRTVWR-587-maint-VAndrey Lihatskiy
# Conflicts: # autobuild.xml
2023-08-23Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-08-21Darwin not (directly) relying on Carbon & Obj-CErik Kundiman
HiDPI support & multi threaded OpenGL haven't been used since we switched to SDL2 on Darwin, and so far there hasn't been any sign that things aren't working any more significantly.
2023-08-03SL-18049 Part 1; Allow voice to be enabled in second instanceAndrey Kleshchev
2023-07-29Start adding LibVLC support when using system libsErik Kundiman
Streaming is not working yet, though. Until it's made sure that the dynamic library and plugins needed are on the paths the executable is expecting them to be.
2023-07-21SL-18837: Merge branch 'main' of secondlife/viewer into actionsNat Goodspeed
2023-07-19FreeBSD gets handled too in llappviewer.cppErik Kundiman
Mostly following Linux.
2023-07-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-07-17Merge branch 'main' (DRTVWR-580) into DRTVWR-567Andrey Kleshchev
# Conflicts: # indra/llui/llfolderviewitem.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodelbackgroundfetch.cpp
2023-07-17Merge branch 'main' (DRTVWR-580) into DRTVWR-587-maint-VAndrey Kleshchev
2023-07-17Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp
2023-07-17SL-19306 A method of displaying user-customized keybindings in user-visible textAndrey Kleshchev
2023-06-28SL-18837: Make LLVersionInfo::getBuild() S64 for GitHub run IDs.Nat Goodspeed
2023-06-26SL-19909 Fix for reflection probes on vehicles blocking mouse clicks. ↵RunitaiLinden
Incidental instrumentation and decruft.
2023-05-23SL-19744: Remove LLErrorThread and LLAppViewer::handleViewerCrash()Nat Goodspeed
2023-05-17Add a binary cache for compiled shaders using glProgramBinary (#216)Rye Mutt
* 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-17Merge branch 'main' into DRTVWR-567Andrey Lihatskiy
# Conflicts: # doc/contributions.txt
2023-05-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-05-17Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # indra/newview/llagentlistener.cpp # indra/newview/llcommanddispatcherlistener.cpp # indra/newview/llfilepicker_mac.mm # indra/newview/llworldmapview.cpp
2023-05-12SL-19710 Fix for deadlock in LLPerfStats. Move General thread ↵RunitaiLinden
initialization to earlier in session (unrelated).
2023-05-11SL-19656 Remove LLPerfStats thread and fold into General thread. Hook ↵RunitaiLinden
avatar GPU time into LLPerfStats. Incidental decruft.
2023-05-09Merge pull request #205 from secondlife/sl-19676-360mode-statssimon-linden
sl-19676 - Stats on updates and scene loading
2023-05-04Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-559Brad Linden
2023-05-04First work on sl-19676 - Stats on updatessimon
2023-05-03DRTVWR-575: Replace some LLSDArray() usage with llsd::array().Nat Goodspeed
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 bb718155bddfbe7007029a0c9e69a4a98615f14d)
2023-05-02Merge branch 'main' into DRTVWR-567Andrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2023-05-02Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
2023-04-27More merge cleanup after DRTVWR-559 & DRTVWR-539 merge. (thanks Ansariel)Brad Linden
2023-04-26Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539Brad Linden
2023-04-03SL-18458 Make LLVOCache the one source of truth on most recently received ↵RunitaiLinden
overrides. (#147)
2023-03-31Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/llfloateravatarrendersettings.cpp
2023-03-30Merge branch 'main' into DRTVWR-567Maxim Nikolenko
# 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-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-03-30Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-20Merge branch 'DRTVWR-568' into DRTVWR-573-maint-RAndrey Lihatskiy
# 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-10DRTVWR-559 Fix for assert in LLVertexBuffer, incidental decruft.Dave Parks
2023-02-21SL-19108 Rename outfit snapshot floaterAndrey Kleshchev
2023-02-17SL-19204 Crash at removeObserverAndrey Kleshchev
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-09Merge branch 'main' into DRTVWR-577-maint-SAndrey Kleshchev
# 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-03Merge branch 'xcode-14.1' into andreyk/SL-19134Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 13:16:14 +0000