diff options
author | Dave Parks <davep@lindenlab.com> | 2011-06-07 14:42:54 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-06-07 14:42:54 -0500 |
commit | f1784209d5fc4e3f9402fbc8fa66de5a67a73f70 (patch) | |
tree | 56922332d7fce623e1ad973e09f72d9dd982b289 /indra/newview/llviewerwindow.cpp | |
parent | 690f18c948003c9d14524da8cdf5b82da8227758 (diff) | |
parent | 81af06c95490a54e69b6bbf01ae2ef98adb66a02 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 34d15a597e..b1441cc281 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -601,7 +601,7 @@ public: ypos += y_inc; - if (gSavedSettings.getBOOL("MeshEnabled")) + if (gMeshRepo.meshRezEnabled()) { addText(xpos, ypos, llformat("%.3f MB Mesh Data Received", LLMeshRepository::sBytesReceived/(1024.f*1024.f))); |