summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2022-05-26Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-05-07Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-04Merge branch master (D550) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/newview/llappviewer.h
2022-05-04Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-05-04Merge branch 'master' into DRTVWR-543-maint_cmakeAndrey Lihatskiy
2022-05-04Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-04-29SL-17124 switchContext and loadShaderFile crashesAndrey Kleshchev
- Do not try initializing shaders if requirements are not met or if window does not exist - Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close() - mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-21SL-17040 Crash due to LLWord not existingAndrey Kleshchev
LLWord should persist till the end due to wide usage.
2022-04-21SL-17159 Crash initializing LLInstanceTrackerPrivateAndrey Kleshchev
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
2022-04-18Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-04-18Merge remote-tracking branch 'origin/DRTVWR-543-maint' into ↵Nicky
DRTVWR-543-maint_cmake
2022-04-18Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfloatersearch.cpp # indra/newview/llgroupactions.cpp # indra/newview/llvovolume.cpp
2022-04-18Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-04-18Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-18Correctio for preproc #elseNicky
2022-04-14SL-17035 Crash at gl_debug_callbackAndrey Kleshchev
RenderDebugGL was avaliable from develop menu, but since it was persistent, caused slowdowns and crashes it could result in users crashing or lagging without knowing the cause. To resolve the issue it was made to last for a single session.
2022-04-05SL-15232: Clean up LLWorldMapView a bit.Cosmic Linden
Avoid a static variable hack and convert a few related variables/methods to non-static as well
2022-04-05SL-15232: Test to scroll mouse wheel to map position on main map/minimapCosmic Linden
2022-03-29SL-16831 Fix unit testAndrey Kleshchev
2022-03-25SL-16831 Fix unit testAndrey Kleshchev
2022-03-09SL-16972 Per feedback from Ansariel, only bump up max heap size on 64-bit ↵Dave Parks
builds.
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-02-28Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
2022-02-11SL-10190: Add menu commands to force AV or exception in coroutine.Nat Goodspeed
"Bad memory access" and "unhandled exception" are the two categories of error that we expect might be different in a coroutine than in the viewer's main fiber. Without this change, we've had no reliable way to force either of those to occur. This will require translation work for two new menu items. # Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml
2022-02-11SL-10190: Introduce LLCoros::saveException() and rethrow().Nat Goodspeed
This mechanism uses a queue of std::exception_ptrs to transport an (otherwise) uncaught exception from a terminated coroutine to the thread's main fiber. The main loop calls LLCoros::rethrow() just after giving some cycles to ready coroutines that frame. # Conflicts: # indra/llcommon/llcoros.cpp # indra/llcommon/llcoros.h # indra/newview/llappviewer.cpp
2022-02-08Merge branch 'DRTVWR-555' into DRTVWR-553+555Andrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llappviewer.cpp # indra/newview/viewer_manifest.py
2022-01-31SL-13792: Use new Python 3 SLVersionChecker.Nat Goodspeed
On Mac, execute the packaged SLVersionChecker directly rather than invoking system Python on our manually-bundled scripts.
2022-01-27SL-16717 Rename RenderGLCoreProfile to prevent compatibility issuesAndrey Kleshchev
2022-01-14SL-16606: Add profiler category NETWORKPtolemy
2022-01-14SL-16606: Add profiler category APPPtolemy
2022-01-11SL-15083 Remove old vfs filesMnikolenko Productengine
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2022-01-10SL-15083 Add 'DiskCacheVersion' to keep 'filesystem cache' in checkMnikolenko Productengine
2022-01-07Merged in SL-13297 (pull request #820)Howard Stearns
SL-13297 Show both voice versions Approved-by: Andrey Kleshchev Approved-by: Andrey Lihatskiy
2022-01-06SL-13297 - Change names to match coding standard.Howard Stearns
2022-01-06SL-13297 - Record and use build version reported by SLVoiceHoward Stearns
2022-01-06SL-13297 - Show both server/voice versions only if mismatched. Otherwise ↵Howard Stearns
show the longer one.
2022-01-06SL-13297 - Create LLLicenseInfo and use it in LLAppViewer::getViewerInfo and ↵Howard Stearns
LLFloaterAbout::postBuild.
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-12-16DRTVWR-546 fix sUseFBO merge errorsDave Houlton
2021-12-16Merge branch 'SL-15742' into DRTVWR-527-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-11Merge branch 'master' into SL-15742Bennett Goble
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 06:06:29 +0000