diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-02 15:35:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-02 15:35:18 -0400 |
| commit | 76eb05380c619daac543872d9ad3ca40a03062c0 (patch) | |
| tree | c912cdfd58eb135231c6230b84f230439f362163 /indra/newview/llworld.cpp | |
| parent | 592ebc9ec63b3c1e636fdd96c68353f97e298506 (diff) | |
| parent | a6e94d201612dcf601aba2a665ddaf86745c9803 (diff) | |
automated merge
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; } |