diff options
author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-22 13:04:53 -0700 |
---|---|---|
committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-22 13:04:53 -0700 |
commit | 569f3f4b06fc2f5a0fa658a49d519428983403f9 (patch) | |
tree | 3fdafee487d0b922793ff864970ce73f223cd861 /indra/newview/llappviewer.cpp | |
parent | 05c2f451dcbb7fdfb6d45d8b65ec71ba6b799af4 (diff) | |
parent | 6d8e9cd8bde57bd033beeb9610f7094c19655ed1 (diff) |
Merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index f140547497..c07d891800 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1360,10 +1360,8 @@ bool LLAppViewer::cleanup() llinfos << "Cleaning Up" << llendflush; -#if LL_MESH_ENABLED // shut down mesh streamer gMeshRepo.shutdown(); -#endif // Must clean up texture references before viewer window is destroyed. LLHUDManager::getInstance()->updateEffects(); @@ -1761,10 +1759,8 @@ bool LLAppViewer::initThreads() mFastTimerLogThread->start(); } -#if LL_MESH_ENABLED // Mesh streaming and caching gMeshRepo.init(); -#endif LLFilePickerThread::initClass(); |