diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-11-22 20:55:57 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-11-22 20:55:57 -0700 |
| commit | 04aece3282025ed0f117a9ade96edc0bf906b3cf (patch) | |
| tree | 5ef06f17145996b8180460b617f0bc13f2caa99f /indra/newview/llviewerregion.cpp | |
| parent | 0954d4f5d563740d0425fb9e8d118a95a34bd283 (diff) | |
fix for SH-4635: Interesting: Some objects do not load on the second visit
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index bcb7943d7f..939c6dbed1 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -847,7 +847,7 @@ void LLViewerRegion::replaceVisibleCacheEntry(LLVOCacheEntry* old_entry, LLVOCac } //physically delete the cache entry -void LLViewerRegion::killCacheEntry(LLVOCacheEntry* entry, bool kill_obj) +void LLViewerRegion::killCacheEntry(LLVOCacheEntry* entry) { if(!entry) { @@ -857,14 +857,6 @@ void LLViewerRegion::killCacheEntry(LLVOCacheEntry* entry, bool kill_obj) //remove from active list and waiting list if(entry->isState(LLVOCacheEntry::ACTIVE)) { - if(kill_obj && entry->getEntry()) - { - LLDrawable* drawablep = (LLDrawable*)entry->getEntry()->getDrawable(); - if(drawablep) - { - gObjectList.killObject(drawablep->getVObj()); - } - } mImpl->mActiveSet.erase(entry); } else @@ -894,20 +886,15 @@ void LLViewerRegion::killCacheEntry(LLVOCacheEntry* entry, bool kill_obj) { entry->removeAllChildren(); } - - if(kill_obj) - { - entry->setState(LLVOCacheEntry::INACTIVE); - } //remove from mCacheMap, real deletion mImpl->mCacheMap.erase(entry->getLocalID()); } //physically delete the cache entry -void LLViewerRegion::killCacheEntry(U32 local_id, bool kill_obj) +void LLViewerRegion::killCacheEntry(U32 local_id) { - killCacheEntry(getCacheEntry(local_id), kill_obj); + killCacheEntry(getCacheEntry(local_id)); } U32 LLViewerRegion::getNumOfActiveCachedObjects() const @@ -2063,7 +2050,7 @@ void LLViewerRegion::decodeBoundingInfo(LLVOCacheEntry* entry) if(obj) { //remove from old region - old_regionp->killCacheEntry(obj->getLocalID(), false); + old_regionp->killCacheEntry(obj->getLocalID()); //change region obj->setRegion(this); |