diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-25 09:12:01 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-25 09:12:01 -0400 |
| commit | bc0df31d1beaa6eddd48431eb9e42d38d3698673 (patch) | |
| tree | b91721574b83ace8dd3cd3c338a5d55e3fb9da4d /indra/newview/llviewertexturelist.cpp | |
| parent | 781addcbc1c7611153ff58fd2f28062a1c4cd041 (diff) | |
| parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) | |
automated merge viewer-development -> mesh-development
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index d9ff931575..cd6653b0c7 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -110,8 +110,8 @@ void LLViewerTextureList::doPreloadImages() { LL_DEBUGS("ViewerImages") << "Preloading images..." << LL_ENDL; - llassert_always(mInitialized) ;
- llassert_always(mImageList.empty()) ;
+ llassert_always(mInitialized) ; + llassert_always(mImageList.empty()) ; llassert_always(mUUIDMap.empty()) ; // Set the "missing asset" image |