diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 12:55:21 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 12:55:21 -0700 |
| commit | 73bbcfb07bdb0ea5828a2e214b87c4fabe805eaa (patch) | |
| tree | c395415163893b341dfbc3c54da77b8b924725af /indra/newview/llviewerwindow.cpp | |
| parent | c32b0122ab915ce9bd0cfd8ec330495f2832d97d (diff) | |
| parent | bc014c2e9e17a97c4dc5e0f9cb19654cad4b8980 (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))); |