diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-27 12:28:42 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-27 12:28:42 -0400 |
| commit | d64babaeebf301232b812e2be5461d6a32f5491f (patch) | |
| tree | 076f9d0e66519ae24a680f9d1178b4844a8c2229 /indra/newview/llviewertexturelist.cpp | |
| parent | ac9928918dce40ef2d451a4068af2ada50bd83f1 (diff) | |
| parent | fede6c44938160ae56cd78a4c69a6bb8e48f0064 (diff) | |
STORM-1286 - merge changes for SH-1624
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index cd6653b0c7..a50361add2 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -88,15 +88,16 @@ LLViewerTextureList::LLViewerTextureList() { } -void LLViewerTextureList::init() +void LLViewerTextureList::start() { sRenderThreadID = LLThread::currentID() ; - + mInitialized = TRUE ; sNumImages = 0; - mMaxResidentTexMemInMegaBytes = 0; - mMaxTotalTextureMemInMegaBytes = 0 ; - +} + +void LLViewerTextureList::init() +{ mUpdateStats = TRUE; // Update how much texture RAM we're allowed to use. |