summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2022-02-01 15:49:32 -0700
committerDave Houlton <euclid@lindenlab.com>2022-02-01 15:49:32 -0700
commitfdc4a81b578f26ce573d6b60760c8235312a6372 (patch)
tree0ee6880004038bd6af925b9e8bd0b1d4cd4f4cd3 /indra/newview/llviewerwindow.cpp
parent795a349b9f44183970b1e8abc632c4d7f8bbea37 (diff)
Revert "Merged in euclid-16418 (pull request #846)"
This reverts commit 40fe5277e1390c975d9a3184ff8fc46d69dfb450, reversing changes made to af830e5fc5840194be95140f644a27011b9b7e06.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index ba93f4f5f9..b9a5e90df0 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2027,9 +2027,6 @@ 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;
@@ -2419,8 +2416,7 @@ 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;