diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-06-01 12:09:40 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-06-01 12:09:40 -0600 |
| commit | 244f1a3d01bb52bb679fd826faa15d90d7df3666 (patch) | |
| tree | e72ea399a4a632d1692bc2ff6ce120ca6db96790 /indra/newview/llviewertexturelist.cpp | |
| parent | 17de5c7c46621603443fc531d8b4660e946ad098 (diff) | |
fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307)
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..3eeed55cd8 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 |