diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
| commit | 13de92740e55e8ba5111e1cd16e239ebeda3a578 (patch) | |
| tree | 5da5b829085d2a19422ce1f2f987b395080369cc /indra/newview/llviewerwindow.cpp | |
| parent | ab431d1774d5b282836a3327dd0bfa8b3b91632b (diff) | |
| parent | 9a2e35f7cab1ba119e9887cd307f021fc6ae0bd5 (diff) | |
merge latest viewer-development
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))); |