From b100f1d2d43564cab5cebfbace66f14a9b7615df Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Wed, 1 Jun 2011 12:09:40 -0600
Subject: fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307)

---
 indra/newview/llviewertexturelist.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'indra/newview/llviewertexturelist.cpp')

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index a50361add2..1ffae7ce83 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -88,17 +88,14 @@ LLViewerTextureList::LLViewerTextureList()
 {
 }
 
-void LLViewerTextureList::start()
-{
+void LLViewerTextureList::init()
+{			
 	sRenderThreadID = LLThread::currentID() ;
-	
 	mInitialized = TRUE ;
 	sNumImages = 0;
-}
-
-void LLViewerTextureList::init()
-{			
 	mUpdateStats = TRUE;
+	mMaxResidentTexMemInMegaBytes = 0;
+	mMaxTotalTextureMemInMegaBytes = 0 ;
 	
 	// Update how much texture RAM we're allowed to use.
 	updateMaxResidentTexMem(0); // 0 = use current
-- 
cgit v1.2.3