summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.cpp
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2011-06-07 16:54:13 -0400
committerprep linden <prep@lindenlab.com>2011-06-07 16:54:13 -0400
commitc4c8e13ac5f555a5b9257582bcc8c3494be1de5d (patch)
tree897327da900fb002065b1e2f01f213333115d556 /indra/newview/llviewertexturelist.cpp
parentdbd619508ba45292c2cebe096494c28e74941643 (diff)
parent017da5453e92170ba37e93f364f30a9ccfbff202 (diff)
merge
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r--indra/newview/llviewertexturelist.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index cd6653b0c7..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