diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-04-29 18:04:23 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-04-29 18:04:23 -0700 |
| commit | 37084d7edb5cdca4666fdf4cdc4d1fd57302c92a (patch) | |
| tree | b347af3b8c656c17f369eb2e80d44c1dd15eefac /indra/llmessage | |
| parent | a5659ac3c9ab5017bae75238f81413a2ebc05296 (diff) | |
| parent | 72c43237fc184d07936edbc4f1dbd18d394c4ce9 (diff) | |
STORM-1213 : pull from viewer-experience-merge
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llavatarnamecache.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index 33e6709983..97f2792686 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -554,7 +554,7 @@ void LLAvatarNameCache::eraseUnrefreshed() { sLastExpireCheck = now; - 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 < max_unrefreshed) @@ -564,8 +564,12 @@ void LLAvatarNameCache::eraseUnrefreshed() << " user '" << av_name.mUsername << "' " << "expired " << now - av_name.mExpires << " secs ago" << LL_ENDL; - sCache.erase(it); + sCache.erase(it++); } + else + { + ++it; + } } LL_INFOS("AvNameCache") << sCache.size() << " cached avatar names" << LL_ENDL; } |