diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-06-21 18:29:50 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-06-21 18:29:50 -0400 |
commit | d5ea63119d1cc848318dbeeaa42e9ce3b777ee51 (patch) | |
tree | 4b5403406184c8e7635ccb989a2dfceb46f95693 /indra/newview/llviewerwindow.cpp | |
parent | 20100ba38c6d3fa16ab11be2ed326ab0964c4c21 (diff) | |
parent | ede3b577d8cebd5065514bb485e2cbd93dd5b05a (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))); |