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

Merge

master
Richard Linden 2014-01-09 12:19:13 -08:00
parent 516061275b 6a11332552
commit 1d0d485b69
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llviewerregion.cpp
View File

@ -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.