Merge from viewer-experience

1 files changed, 5 insertions, 7 deletions

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 33e7328cd7..1ffae7ce83 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -89,16 +89,14 @@ LLViewerTextureList::LLViewerTextureList()
 }
 
 void LLViewerTextureList::init()
-{
+{			
 	sRenderThreadID = LLThread::currentID() ;
-
 	mInitialized = TRUE ;
 	sNumImages = 0;
+	mUpdateStats = TRUE;
 	mMaxResidentTexMemInMegaBytes = 0;
 	mMaxTotalTextureMemInMegaBytes = 0 ;
 	
-	mUpdateStats = TRUE;
-	
 	// Update how much texture RAM we're allowed to use.
 	updateMaxResidentTexMem(0); // 0 = use current
 	
@@ -110,8 +108,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
@@ -835,7 +833,7 @@ F32 LLViewerTextureList::updateImagesFetchTextures(F32 max_time)
 	for (entries_list_t::iterator iter3 = entries.begin();
 		 iter3 != entries.end(); )
 	{
-		LLPointer<LLViewerFetchedTexture> imagep = *iter3++;
+		LLViewerFetchedTexture* imagep = *iter3++;
 		
 		bool fetching = imagep->updateFetch();
 		if (fetching)