diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-06-03 14:34:00 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-06-03 14:34:00 -0700 |
| commit | bc014c2e9e17a97c4dc5e0f9cb19654cad4b8980 (patch) | |
| tree | 9ad50a74079b8f571c8f873ae2de1eec16474e5b /indra/newview/llviewerwindow.cpp | |
| parent | f4722b39059147088b9008736370b407daec5d91 (diff) | |
| parent | 31e850d04885bed2ac779c66bb6b7923a0a51d96 (diff) | |
automated 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 6fe79c2e85..4ecf156646 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))); |