diff options
| author | Dave Parks <davep@lindenlab.com> | 2009-12-11 14:50:45 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2009-12-11 14:50:45 -0600 |
| commit | 35e2527230beacf8a545f8d609a61c80812bed32 (patch) | |
| tree | 2a5d250b34e1aded387fb06b109bbb4fe0a9bcb8 /indra/newview/llappviewer.cpp | |
| parent | fadfa09e6d3bbff9ebae0aabeacf26a83aae4ad7 (diff) | |
| parent | 695969c77066de5032bdc9caefecf9b32b076b2f (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 508badcc6f..e856987726 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -48,6 +48,7 @@ #include "llwindow.h" #include "llviewerstats.h" #include "llmd5.h" +#include "llmeshrepository.h" #include "llpumpio.h" #include "llmimetypes.h" #include "llslurl.h" @@ -1263,6 +1264,9 @@ bool LLAppViewer::cleanup() llinfos << "Cleaning Up" << llendflush; + // shut down mesh streamer + gMeshRepo.shutdown(); + // Must clean up texture references before viewer window is destroyed. LLHUDManager::getInstance()->updateEffects(); LLHUDObject::updateAll(); @@ -1675,6 +1679,9 @@ bool LLAppViewer::initThreads() mFastTimerLogThread->start(); } + // Mesh streaming and caching + gMeshRepo.init(); + // *FIX: no error handling here! return true; } @@ -2391,6 +2398,7 @@ bool LLAppViewer::initWindow() gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE ); gPipeline.init(); + stop_glerror(); gViewerWindow->initGLDefaults(); |