diff options
author | Oz Linden <oz@lindenlab.com> | 2011-06-01 19:05:36 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-06-01 19:05:36 -0400 |
commit | 147567349ec0662300c2a7b80bf7729a2e064c4d (patch) | |
tree | 5f425dc94bc3976e5e7539e68216193de420b874 /indra/newview/llviewertexturelist.cpp | |
parent | 2002a39e4db5ba96f4a0a7653f76a3cd55846a31 (diff) | |
parent | b100f1d2d43564cab5cebfbace66f14a9b7615df (diff) |
pull back fix for storm-1298 from beta branch
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r-- | indra/newview/llviewertexturelist.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
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 |