diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-10 11:51:55 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-10 11:51:55 -0700 |
| commit | 807aec7bafe19fca75a8f3980bd621fad7c8338e (patch) | |
| tree | f2e120963ff103524ef6206506c1ee9e0bdd3a2d /indra/newview/llworld.cpp | |
| parent | 19026c621e338040df59adabdf7055924271f66d (diff) | |
| parent | 1f46b1d87bf4664e62131e7823ab5a7fcafe4b73 (diff) | |
Pull from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 2ad43ff394..5760d04a08 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -121,6 +121,7 @@ void LLWorld::destroyClass() LLViewerRegion* region_to_delete = *region_it++; removeRegion(region_to_delete->getHost()); } + LLVOCache::getInstance()->destroyClass() ; LLViewerPartSim::getInstance()->destroyClass(); } @@ -256,6 +257,8 @@ void LLWorld::removeRegion(const LLHost &host) llwarns << "Disabling region " << regionp->getName() << " that agent is in!" << llendl; LLAppViewer::instance()->forceDisconnect(LLTrans::getString("YouHaveBeenDisconnected")); + + regionp->saveObjectCache() ; //force to save objects here in case that the object cache is about to be destroyed. return; } |