diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-02-02 00:34:05 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-02-02 00:34:05 +0000 |
| commit | e6d44588d00d32e8ded5a69c29cd9ab5d78407df (patch) | |
| tree | 0ee6880004038bd6af925b9e8bd0b1d4cd4f4cd3 /indra/newview/llviewerwindow.cpp | |
| parent | 0b850360f5f3e520fa3bd321e2e105c24d1f46f0 (diff) | |
| parent | fdc4a81b578f26ce573d6b60760c8235312a6372 (diff) | |
Merged in revert-16418 (pull request #854)
Revert SL-16418 commits
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
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; |