summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-06-13 02:48:52 +0000
committerDon Kjer <don@lindenlab.com>2011-06-13 02:48:52 +0000
commit45c6dcbe87fbfc1351e4faa9ef3196a191b7dd69 (patch)
tree4fe43929cb518d67e8afbd227db3bc62e4d175e5 /indra/newview/llviewertexturelist.cpp
parent694b0838bc80efc152e7ecda09ffdc7a944b7079 (diff)
parent12d9d1d3ef76518171ae87aae2467593218f8413 (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