diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2014-01-06 23:00:57 -0700 | 
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2014-01-06 23:00:57 -0700 | 
| commit | 217a85337aa97a445b1d3121182d76524b0a05a6 (patch) | |
| tree | 0d338b89cd0fe993f2206556b9cc640d5f62990e | |
| parent | 10ae6a779e6726da24acb0ae60bb8f430daf9bdb (diff) | |
fix a compiling error for mac and linux.
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 10 | 
1 files changed, 8 insertions, 2 deletions
| diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index ae4306847c..f7a29cd317 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.  		{ | 
