diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-21 09:55:30 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-21 09:55:30 -0500 |
| commit | 5f85e7a82458fff56aa79f7e7fe2986edc069ca3 (patch) | |
| tree | 01c9c6b6f6cb06b828d4e1d539b455a6a7ac7e9c /indra/newview/llviewerwindow.cpp | |
| parent | 1074219c8a44cbf6f3b1b0a68dd0ca8c656465fa (diff) | |
| parent | 52782548c83dc0ca0fc8352e1a3ad68784116a91 (diff) | |
merge changes for SH-2973
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() ; |