diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-03-25 15:25:35 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-03-25 15:25:35 +0200 |
| commit | 911472ed08490cbc08ba5009be82b247c51102a7 (patch) | |
| tree | f9d5efb2e0037e5b602f2be23120910c40b94919 /indra/newview/llviewerwindow.cpp | |
| parent | e0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (diff) | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
Merge with viewer-release
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 8a713ae22c..e0653fec30 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2021,6 +2021,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(); @@ -2031,10 +2037,6 @@ void LLViewerWindow::shutdownGL() LLWorldMapView::cleanupTextures(); - llinfos << "Cleaning up pipeline" << llendl; - gPipeline.cleanup(); - stop_glerror(); - LLViewerTextureManager::cleanup() ; LLImageGL::cleanupClass() ; |