Commit Graph

1866 Commits (2dd3030993db6b2d310decdb09caef4e6f83bd97)

Author SHA1 Message Date
Andrey Kleshchev 87664fa35d SL-18219 Crash getting and sending render info on exit
There might be other causes for sendRenderInfoToRegion and getRenderInfoFromRegion, crashing, but in some cases viewer was shutting down
2022-11-22 23:08:47 +02:00
Rye Mutt d89033420e Fix RenderAppleUseMultGL debug setting for enabling threaded GL engine 2022-10-29 23:18:03 -04:00
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
#	indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
Andrey Lihatskiy 59ab8e78f4 Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
Andrey Lihatskiy ea26ee5e92 Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llvovolume.cpp
2022-08-04 00:15:36 +03:00
Maxim Nikolenko 6fc22df480 SL-17727 FIXED Crash when specifying --graphicslevel option on mac 2022-07-08 19:03:51 +03:00
Andrey Lihatskiy 2e837e5389 Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
Andrey Lihatskiy 77ce594dec Merge branch 'master' into DRTVWR-544-maint 2022-06-29 20:31:17 +03:00
Cosmic Linden db5806f004 SL-17329: Address Mac build error 2022-06-24 13:31:33 -07:00
Cosmic Linden 4f83471166 SL-17329: Fix cache sizes due to overflow. Improve typing. 2022-06-24 09:21:27 -07:00
Cosmic Linden 0d250e632c SL-17329: Fix texture cache not respecting DiskCachePercentOfTotal 2022-06-22 13:28:26 -07:00
Andrey Kleshchev 75668d4522 SL-17585 Crash at LLAppViewer::initConfiguration 2022-06-17 00:35:32 +03:00
Cosmic Linden 3e60b53d52 SL-16182: Offload audio decoding from the main thread to the general work queue.
The work queue callback binds "this". This is deemed safe due to current dependencies, but see the associated comment in the return callback. There was some trial and error to get a this-binded lambda to compile.

Due to LLVorbisDecodeState writing to disk off-thread, limit audio decodes proportional to general worker thread count. Guess the thread count for now.
2022-06-14 11:31:52 -07:00
Andrey Kleshchev 2efd6727c1 SL-17546 Fix 'release' configuration build tests 2022-06-08 19:47:37 +03:00
Andrey Kleshchev 314d086814 SL-17546 Do not launch updater for a non-interactible instance 2022-06-07 22:21:07 +03:00
Andrey Lihatskiy dd2fe2687c DRTVWR-544 post-merge fix (restored SL-14961) 2022-05-31 02:35:29 +03:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
Andrey Lihatskiy a426e8ddb3 DRTVWR-543 post-merge cleanup 2022-05-27 19:05:14 +03:00
Andrey Lihatskiy 8bfd7e16f8 post-merge build fix 2022-05-27 03:22:22 +03:00
Andrey Lihatskiy 3da7a50b71 Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
Andrey Lihatskiy 91606c7b60 Merge branch 'master' into DRTVWR-548-maint-N 2022-05-26 03:07:05 +03:00
Andrey Kleshchev f3add82a4c Merge branch master (D550) into DRTVWR-546
# Conflicts:
#	indra/newview/llappviewer.h
2022-05-04 20:10:29 +03:00
Andrey Lihatskiy 7fff7eecb6 Merge branch 'master' into DRTVWR-543-maint 2022-05-04 18:51:05 +03:00
Andrey Lihatskiy 0e4ffe41bc Merge branch 'master' into DRTVWR-548-maint-N 2022-05-04 18:50:43 +03:00
Andrey Kleshchev 904b16a0a7 SL-17124 switchContext and loadShaderFile crashes
- 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-29 19:41:22 +03:00
Andrey Kleshchev ffdc04f5d2 SL-17040 Crash due to LLWord not existing
LLWord should persist till the end due to wide usage.
2022-04-21 22:58:30 +03:00
Andrey Kleshchev cf7bc4406e SL-17159 Crash initializing LLInstanceTrackerPrivate 2022-04-21 20:43:50 +03:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
Brad Kittenbrink e9921e77b0 Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa 2022-04-18 13:29:25 -07:00
Andrey Lihatskiy 026ad511ea Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
Andrey Lihatskiy 16494f4400 Merge branch 'master' into DRTVWR-548-maint-N 2022-04-18 20:38:56 +03:00
Andrey Lihatskiy dbb044e9bb Merge branch 'master' into DRTVWR-543-maint 2022-04-18 20:38:06 +03:00
Andrey Kleshchev e5cd4da823 SL-17035 Crash at gl_debug_callback
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-14 22:26:58 +03:00
Cosmic Linden c6cba3a67d SL-15232: Clean up LLWorldMapView a bit.
Avoid a static variable hack and convert a few related variables/methods to non-static as well
2022-04-05 11:55:34 -07:00
Cosmic Linden d3a616122f SL-15232: Test to scroll mouse wheel to map position on main map/minimap 2022-04-05 11:55:34 -07:00
Andrey Kleshchev d5f2537764 SL-16831 Fix unit test 2022-03-29 17:30:50 +03:00
Andrey Kleshchev d11df20601 SL-16831 Fix unit test 2022-03-25 17:08:34 +02:00
Dave Parks 0e954a9afd SL-16972 Per feedback from Ansariel, only bump up max heap size on 64-bit builds. 2022-03-09 12:48:52 -06:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# 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-03-01 13:41:42 +02:00
Andrey Lihatskiy 1e0eafd50c Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
Andrey Lihatskiy 201f83472c Merge branch 'master' into DRTVWR-543-maint 2022-02-28 21:55:28 +02:00
Andrey Lihatskiy 73eec89131 Merge branch 'master' into DRTVWR-540-maint
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
Nat Goodspeed cedbf23fd1 SL-10190: Add menu commands to force AV or exception in coroutine.
"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-11 21:03:35 +02:00
Nat Goodspeed 6c3507d6d3 SL-10190: Introduce LLCoros::saveException() and rethrow().
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-11 20:53:21 +02:00
Andrey Lihatskiy 967707cfd0 Merge branch 'DRTVWR-555' into DRTVWR-553+555
# Conflicts:
#	autobuild.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/viewer_manifest.py
2022-02-08 23:22:59 +02:00
Nat Goodspeed 91743a9dfa SL-13792: Use new Python 3 SLVersionChecker.
On Mac, execute the packaged SLVersionChecker directly rather than invoking
system Python on our manually-bundled scripts.
2022-01-31 18:07:42 -05:00
Andrey Kleshchev 12f21640c6 SL-16717 Rename RenderGLCoreProfile to prevent compatibility issues 2022-01-27 21:48:23 +02:00
Ptolemy f571de9de4 SL-16606: Add profiler category NETWORK 2022-01-14 11:50:20 -08:00
Ptolemy f268230902 SL-16606: Add profiler category APP 2022-01-14 11:50:18 -08:00
Mnikolenko Productengine c09155574d SL-15083 Remove old vfs files 2022-01-11 19:31:51 +02:00