diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-10-16 20:59:13 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-10-16 20:59:13 -0600 |
| commit | 2b4dfefda216a0333426ac2a8f06d23ee6ef0aee (patch) | |
| tree | 59510a8ba3c9c78ea90128855d069f2efda4fdd3 /indra/newview/llvocache.cpp | |
| parent | 816c86a3cbb86ac2ffe9419fccee27219152190d (diff) | |
more fix for SH-4552: Interesting: objects sometimes fail to load after teleport.
Diffstat (limited to 'indra/newview/llvocache.cpp')
| -rwxr-xr-x | indra/newview/llvocache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index f16f3507c3..89a49ff1ed 100755 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -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; |