diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-02-03 21:15:57 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-02-03 21:15:57 +0000 |
| commit | 46f8fb8781ccce338b4a88aaf8371ee3dec56d29 (patch) | |
| tree | b2dc09521a166d2181c48f4a4f1ca90b83b99477 /indra/newview/llfloaterlagmeter.cpp | |
| parent | e188badaf29a1a02307f93864eed6737096bd9a1 (diff) | |
svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
Diffstat (limited to 'indra/newview/llfloaterlagmeter.cpp')
| -rw-r--r-- | indra/newview/llfloaterlagmeter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp index 02741e0180..15f1e4852d 100644 --- a/indra/newview/llfloaterlagmeter.cpp +++ b/indra/newview/llfloaterlagmeter.cpp @@ -184,7 +184,7 @@ void LLFloaterLagMeter::determineClient() { mClientCause->setText( getString("client_texture_loading_cause_msg", mStringArgs) ); } - else if(LLViewerImage::sBoundTextureMemory > LLViewerImage::sMaxBoundTextureMem) + else if((LLViewerImage::sBoundTextureMemory >> 20) > LLViewerImage::sMaxBoundTextureMem) { mClientCause->setText( getString("client_texture_memory_cause_msg", mStringArgs) ); } |