e9cd2b320e
Post-merge conflict fix
2022-07-12 22:03:50 +03:00
43de9f202e
Merge branch 'master' into DRTVWR-528
...
# Conflicts:
# indra/newview/llappviewer.cpp
2022-07-12 00:42:54 +03:00
2efd6727c1
SL-17546 Fix 'release' configuration build tests
2022-06-08 19:47:37 +03:00
314d086814
SL-17546 Do not launch updater for a non-interactible instance
2022-06-07 22:21:07 +03:00
a426e8ddb3
DRTVWR-543 post-merge cleanup
2022-05-27 19:05:14 +03:00
8bfd7e16f8
post-merge build fix
2022-05-27 03:22:22 +03:00
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
02c71b0ac2
Merge branch 'master' v 6.6.1 into DRTVWR-528
2022-05-26 11:18:44 -06:00
ac10b10426
Merge branch 'master' v 6.5.6 into DRTVWR-528
2022-05-05 10:04:26 -06:00
f3add82a4c
Merge branch master (D550) into DRTVWR-546
...
# Conflicts:
# indra/newview/llappviewer.h
2022-05-04 20:10:29 +03:00
7fff7eecb6
Merge branch 'master' into DRTVWR-543-maint
2022-05-04 18:51:05 +03:00
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
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
cf7bc4406e
SL-17159 Crash initializing LLInstanceTrackerPrivate
2022-04-21 20:43:50 +03:00
035b1996df
Merge branch 'master' into DRTVWR-528
2022-04-18 15:35:23 -06:00
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
e9921e77b0
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
2022-04-18 13:29:25 -07:00
dbb044e9bb
Merge branch 'master' into DRTVWR-543-maint
2022-04-18 20:38:06 +03:00
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
d5f2537764
SL-16831 Fix unit test
2022-03-29 17:30:50 +03:00
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
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
201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02:00
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
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
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
12f21640c6
SL-16717 Rename RenderGLCoreProfile to prevent compatibility issues
2022-01-27 21:48:23 +02:00
f571de9de4
SL-16606: Add profiler category NETWORK
2022-01-14 11:50:20 -08:00
f268230902
SL-16606: Add profiler category APP
2022-01-14 11:50:18 -08:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
970b6661cd
Merge branch 'master' into DRTVWR-543-maint
2021-12-26 14:01:17 +02:00
747dbb7da2
Merge branch 'master' into DRTVWR-540-maint
2021-12-26 14:01:06 +02:00
0fd7d20949
DRTVWR-546 fix sUseFBO merge errors
2021-12-16 11:14:14 -07:00
83b4ea59fc
Merge branch 'SL-15742' into DRTVWR-527-maint
2021-12-16 00:58:44 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
e27f9551e1
DRTVWR-528 merge up to 6.5.2
2021-12-15 13:05:02 -07:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
0b95b9d008
Merge branch 'master' into SL-15742
2021-12-11 10:29:37 -08:00
f729cfc33f
SL-15742: Convert build scripts to Python 3
...
This changeset makes it possible to build the Second Life viewer using
Python 3. It is designed to be used with an equivalent Autobuild branch
so that a developer can compile without needing Python 2 on their
machine.
Breaking change: Python 2 support ending
Rather than supporting two versions of Python, including one that was
discontinued at the beginning of the year, this branch focuses on
pouring future effort into Python 3 only. As a result, scripts do not
need to be backwards compatible. This means that build environments,
be they on personal computers and on build agents, need to have a
compatible interpreter.
Notes
- SLVersionChecker will still use Python 2 on macOS
- Fixed the message template url used by template_verifier.py
2021-12-10 14:42:49 -08:00
5e5be92d79
SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass).
2021-12-06 15:29:34 +00:00
01317a2fad
SL-16421: Destroy the "General" ThreadPool as soon as cleanup starts.
...
Introduce LLAppViewer::onCleanup(), a method that accepts a nullary callable
to execute once viewer shutdown begins. Fire the collected callables in
LLAppViewer::cleanup().
In llstartup.cpp, instead of declaring a static unique_ptr and relying on
static object destruction to clean up the "General" ThreadPool, bind the
pointer to the new ThreadPool into an onCleanup() lambda that will delete it
when called. ~ThreadPool() takes care of orderly shutdown.
2021-11-30 17:00:09 -05:00
9be88050e6
SL-16421: Unify LLAppViewer::cleanup() indentation.
...
Use hard tabs because most of the existing function uses those.
2021-11-30 17:00:09 -05:00
7a0ca277f8
SL-16094: Merge branch 'DRTVWR-546' into glthread
2021-11-29 13:09:59 -05:00
5641f9612c
SL-16408 fixed regression - crash on exit
2021-11-29 17:52:11 +02:00
f7258b49b2
SL-16408 Fix for crashing on disconnect
2021-11-25 17:33:13 +02:00
0b066539fe
DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.
...
Reverting a merge is sticky: it tells git you never want to see that branch
again. Merging the DRTVWR-546 branch, which contained the revert, into the
glthread branch undid much of the development work on that branch. To restore
it we must revert the revert.
This reverts commit 029b41c041
2021-11-24 10:47:54 -05:00
d71e0a6d47
SL-16094, SL-16400: Merge branch 'DRTVWR-546' into glthread
2021-11-23 21:23:45 -05:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
53cf740d87
SL-16094: Service mainloop WorkQueue every LLAppViewer::idle() call
...
even if idle() exits early.
2021-11-19 14:43:20 -05:00
Andrey Lihatskiy