diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-10-16 20:07:00 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-10-16 20:07:00 -0600 |
| commit | 816c86a3cbb86ac2ffe9419fccee27219152190d (patch) | |
| tree | 1ae9238019001d4a08cc96da1fb62654ee123a2b /indra/newview | |
| parent | 1c26d4265666cd232d38724ad6f1e32fd2dc2d34 (diff) | |
| parent | 82c93b52c5d4f31acb52f43b8e82a51ffa3ee584 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 3 |
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; |