From 217a85337aa97a445b1d3121182d76524b0a05a6 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Mon, 6 Jan 2014 23:00:57 -0700
Subject: [PATCH] fix a compiling error for mac and linux.
---
indra/newview/llviewerregion.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index ae4306847c7..f7a29cd317e 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1080,7 +1080,10 @@ void LLViewerRegion::updateVisibleEntries(F32 max_time)
}
else
{
- iter = mImpl->mVisibleEntries.erase(iter);
+ LLVOCacheEntry::vocache_entry_set_t::iterator next_iter = iter;
+ ++next_iter;
+ mImpl->mVisibleEntries.erase(iter);
+ iter = next_iter;
}
}
@@ -1193,7 +1196,10 @@ void LLViewerRegion::clearCachedVisibleObjects()
parent->addChild(entry);
}
- 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.
{
--
GitLab