diff options
| author | Richard Linden <none@none> | 2013-03-22 10:57:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-03-22 10:57:19 -0700 |
| commit | f1539b727946956826c7c5fb0188b7770cfbdc24 (patch) | |
| tree | 8f6371c2d631f5ad26bd3a9c852fa92edee3b090 /indra/newview/llviewerregion.cpp | |
| parent | 5525257b8580df3dbc9860370564e19c9d6cbbaa (diff) | |
| parent | 21b7de56ad6c1efd81ad4406aba1428633b9356e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index b052c87064..d8f9ecf248 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -393,8 +393,8 @@ LLViewerRegion::~LLViewerRegion() delete mParcelOverlay; delete mImpl->mLandp; delete mImpl->mEventPoll; - LLHTTPSender::clearSender(mImpl->mHost); - + LLHTTPSender::clearSender(mImpl->mHost); + std::for_each(mImpl->mObjectPartition.begin(), mImpl->mObjectPartition.end(), DeletePointer()); saveObjectCache(); @@ -1117,8 +1117,8 @@ BOOL LLViewerRegion::idleUpdate(F32 max_update_time) max_update_time -= update_timer.getElapsedTimeF32(); if(max_update_time < 0.f || mImpl->mCacheMap.empty()) { - return did_update; - } + return did_update; +} sCurRegionp = this; @@ -1879,12 +1879,12 @@ LLViewerRegion::eCacheUpdateResult LLViewerRegion::cacheFullUpdate(LLViewerObjec } LLVOCacheEntry* LLViewerRegion::getCacheEntryForOctree(U32 local_id) -{ + { LLVOCacheEntry* entry = getCacheEntry(local_id); removeFromVOCacheTree(entry); - + return entry; -} + } LLVOCacheEntry* LLViewerRegion::getCacheEntry(U32 local_id) { |