diff options
| author | prep <none@none> | 2012-03-02 11:29:30 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-03-02 11:29:30 -0500 |
| commit | f5cebb27a72cf31723eb621bdcd117f7634a4e58 (patch) | |
| tree | 656bda206f1467c61d37acee3440020281440b06 /indra/newview/llviewerwindow.cpp | |
| parent | c2a7006413ea5e4a0bf7b8b75fe5afdb51e9a6e5 (diff) | |
| parent | e1e13bcab96565ddc7627139673519a09a60962f (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 219f00d47d..2d837b3df8 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2037,6 +2037,12 @@ void LLViewerWindow::shutdownGL() gSky.cleanup(); stop_glerror(); + llinfos << "Cleaning up pipeline" << llendl; + gPipeline.cleanup(); + stop_glerror(); + + //MUST clean up pipeline before cleaning up wearables + llinfos << "Cleaning up wearables" << llendl; LLWearableList::instance().cleanup() ; gTextureList.shutdown(); @@ -2047,10 +2053,6 @@ void LLViewerWindow::shutdownGL() LLWorldMapView::cleanupTextures(); - llinfos << "Cleaning up pipeline" << llendl; - gPipeline.cleanup(); - stop_glerror(); - LLViewerTextureManager::cleanup() ; LLImageGL::cleanupClass() ; |