summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2022-01-28 16:46:58 +0000
committerEuclid Linden <euclid@lindenlab.com>2022-01-28 16:46:58 +0000
commit40fe5277e1390c975d9a3184ff8fc46d69dfb450 (patch)
tree5f0432b7f1c3fe6b0b373fdf904bda4f5e58cf5e /indra/newview/llviewerwindow.cpp
parentaf830e5fc5840194be95140f644a27011b9b7e06 (diff)
parentd28a271fa819c076e2cedb87d9f305468e436b25 (diff)
Merged in euclid-16418 (pull request #846)
SL-16418 move media texture updates to background thread Approved-by: Dave Parks
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index b9a5e90df0..ba93f4f5f9 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2027,6 +2027,9 @@ LLViewerWindow::LLViewerWindow(const Params& p)
gTextureList.init();
LLViewerTextureManager::init() ;
gBumpImageList.init();
+
+ // Init Media texture worker queue
+ LLViewerMediaImpl::initClass(mWindow, gSavedSettings.getBOOL("RenderGLMultiThreaded"));
// Create container for all sub-views
LLView::Params rvp;
@@ -2416,7 +2419,8 @@ void LLViewerWindow::shutdownGL()
LLViewerTextureManager::cleanup() ;
SUBSYSTEM_CLEANUP(LLImageGL) ;
-
+ SUBSYSTEM_CLEANUP(LLViewerMediaImpl);
+
LL_INFOS() << "All textures and llimagegl images are destroyed!" << LL_ENDL ;
LL_INFOS() << "Cleaning up select manager" << LL_ENDL;