From 0cbb9a70780d2d444baedde413e8b1f180ea0d27 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sun, 1 May 2011 17:24:37 -0500
Subject: [PATCH] Iterator fix in llavatarnamecache.cpp from v2.

---
 indra/llmessage/llavatarnamecache.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 618c8011d..fcc01990f 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -577,12 +577,16 @@ void LLAvatarNameCache::eraseExpired()
 {
 	F64 now = LLFrameTimer::getTotalSeconds();
 	cache_t::iterator it = sCache.begin();
-	for (cache_t::iterator it = sCache.begin(); it != sCache.end(); ++it)
+	for (cache_t::iterator it = sCache.begin(); it != sCache.end();)
 	{
 		const LLAvatarName& av_name = it->second;
 		if (av_name.mExpires < now)
 		{
-			sCache.erase(it);
+			sCache.erase(it++);
+		}
+		else
+		{
+			++it;
 		}
 	}
 }