diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2014-01-08 11:56:55 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2014-01-08 11:56:55 -0700 |
| commit | 6a113325521fa68c634cd900de8352c35fe91268 (patch) | |
| tree | 4ae9592b8e4da753efbf6ae19ef63ae45355e747 | |
| parent | 217a85337aa97a445b1d3121182d76524b0a05a6 (diff) | |
trivial: convert to unix line endings.
| -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. |