summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-10-16 20:06:21 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-10-16 20:06:21 -0600
commit82c93b52c5d4f31acb52f43b8e82a51ffa3ee584 (patch)
tree59fceb0b269b6b4d2f56824cc99fd90804772126 /indra/newview
parent4755ccf2693e2e5f5f69ec3106256a0e1081dd95 (diff)
fix for SH-4552: Interesting: objects sometimes fail to load after teleport.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewerregion.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index db91b5cd8b..b9c7ded50b 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2096,6 +2096,9 @@ LLViewerRegion::eCacheUpdateResult LLViewerRegion::cacheFullUpdate(LLDataPackerB
}
else //invisible
{
+ //copy some contents from old entry
+ entry->moveTo(new_entry);
+
//remove old entry
killCacheEntry(entry);
entry = new_entry;