diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
| commit | dc48f1c7417f0f49ad1bd32330845ce17a29eece (patch) | |
| tree | 8772aff5f32c1702228b7ca7e324fbd077269854 /indra/newview/llappviewer.cpp | |
| parent | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (diff) | |
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 502160716e..fc092e5cba 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -32,6 +32,7 @@ #include "llviewerprecompiledheaders.h" #include "llappviewer.h" +#include "llprimitive.h" #include "llversionviewer.h" #include "llfeaturemanager.h" @@ -1207,10 +1208,12 @@ bool LLAppViewer::cleanup() gLcdScreen = NULL; #endif - if (!gVolumeMgr->cleanup()) + LLVolumeMgr* volume_manager = LLPrimitive::getVolumeManager(); + if (!volume_manager->cleanup()) { llwarns << "Remaining references in the volume manager!" << llendflush; } + LLPrimitive::cleanupVolumeManager(); LLViewerParcelMgr::cleanupGlobals(); @@ -1219,7 +1222,8 @@ bool LLAppViewer::cleanup() //end_messaging_system(); LLFollowCamMgr::cleanupClass(); - LLVolumeMgr::cleanupClass(); + //LLVolumeMgr::cleanupClass(); + LLPrimitive::cleanupVolumeManager(); LLWorldMapView::cleanupClass(); LLUI::cleanupClass(); @@ -1766,7 +1770,10 @@ bool LLAppViewer::initConfiguration() LLSplashScreen::show(); LLSplashScreen::update(splash_msg.str().c_str()); - LLVolumeMgr::initClass(); + //LLVolumeMgr::initClass(); + LLVolumeMgr* volume_manager = new LLVolumeMgr(); + volume_manager->useMutex(); // LLApp and LLMutex magic must be manually enabled + LLPrimitive::setVolumeManager(volume_manager); // Note: this is where we used to initialize LLFeatureManager::getInstance()->. |