livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more fix for SH-4552: Interesting: objects sometimes fail to load after teleport.

master
Xiaohong Bao 2013-10-16 20:59:13 -06:00
parent 816c86a3cb
commit 2b4dfefda2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewerregion.cpp
View File

@ -2097,7 +2097,7 @@ LLViewerRegion::eCacheUpdateResult LLViewerRegion::cacheFullUpdate(LLDataPackerB
else //invisible
{
//copy some contents from old entry
entry->moveTo(new_entry);
entry->moveTo(new_entry, true);
//remove old entry
killCacheEntry(entry);

4
indra/newview/llvocache.cpp
View File

@ -191,10 +191,10 @@ void LLVOCacheEntry::setOctreeEntry(LLViewerOctreeEntry* entry)
LLViewerOctreeEntryData::setOctreeEntry(entry);
}
void LLVOCacheEntry::moveTo(LLVOCacheEntry* new_entry)
void LLVOCacheEntry::moveTo(LLVOCacheEntry* new_entry, bool no_entry_move)
{
//copy LLViewerOctreeEntry
if(mEntry.notNull())
if(mEntry.notNull() && !no_entry_move)
{
new_entry->setOctreeEntry(mEntry);
mEntry = NULL;

2
indra/newview/llvocache.h
View File

@ -103,7 +103,7 @@ public:
void recordHit();
void recordDupe() { mDupeCount++; }
void moveTo(LLVOCacheEntry* new_entry); //copy variables
void moveTo(LLVOCacheEntry* new_entry, bool no_entry_move = false); //copy variables
/*virtual*/ void setOctreeEntry(LLViewerOctreeEntry* entry);
void setParentID(U32 id) {mParentID = id;}