diff options
| author | Dave Parks <davep@lindenlab.com> | 2009-12-15 17:45:10 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2009-12-15 17:45:10 -0600 |
| commit | b6af8aae5b0cccfb6653d84e2020557c2be945ce (patch) | |
| tree | 8f495acf9360c95aca0c002bcf704ba169ab58ce /indra/newview/llappviewer.cpp | |
| parent | de38b58f37d6c7dadd4a5f15be519cb0bb230fc7 (diff) | |
| parent | 081fa98a47d2b592ada0fbb049ff959ac2cd6294 (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 3250343b25..8dfc1657cf 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" @@ -1273,6 +1274,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(); @@ -1685,6 +1689,9 @@ bool LLAppViewer::initThreads() mFastTimerLogThread->start(); } + // Mesh streaming and caching + gMeshRepo.init(); + // *FIX: no error handling here! return true; } @@ -2401,6 +2408,7 @@ bool LLAppViewer::initWindow() gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE ); gPipeline.init(); + stop_glerror(); gViewerWindow->initGLDefaults(); |