diff options
| author | Richard Linden <none@none> | 2014-01-09 12:19:13 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-01-09 12:19:13 -0800 |
| commit | 1d0d485b69bbbfd63d2d56a795d818131db2667c (patch) | |
| tree | 06ee27e0fa091f31587b590c2794bbefa48d3172 /indra/newview | |
| parent | 516061275bae539218b603b350d3afd1cce858c9 (diff) | |
| parent | 6a113325521fa68c634cd900de8352c35fe91268 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index f7a29cd317..002dac14a7 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1080,9 +1080,9 @@ void LLViewerRegion::updateVisibleEntries(F32 max_time) } else { - LLVOCacheEntry::vocache_entry_set_t::iterator next_iter = iter;
- ++next_iter;
- mImpl->mVisibleEntries.erase(iter);
+ LLVOCacheEntry::vocache_entry_set_t::iterator next_iter = iter; + ++next_iter; + mImpl->mVisibleEntries.erase(iter); iter = next_iter; } } @@ -1196,9 +1196,9 @@ void LLViewerRegion::clearCachedVisibleObjects() parent->addChild(entry); } - LLVOCacheEntry::vocache_entry_set_t::iterator next_iter = iter;
- ++next_iter;
- mImpl->mVisibleEntries.erase(iter);
+ LLVOCacheEntry::vocache_entry_set_t::iterator next_iter = iter; + ++next_iter; + mImpl->mVisibleEntries.erase(iter); iter = next_iter; } else //parent is not cache-able, leave it. |