diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:25:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:25:35 -0500 |
| commit | dd859c5e3eee97db614edc94d36b25d138fa9c5c (patch) | |
| tree | 12d1b281084bd0ec7cb6072fd99a5519304ec77a /indra/newview/llviewerwindow.cpp | |
| parent | 5e6b4b5ad0dc56869430bcd31a942bdc7f8a2899 (diff) | |
| parent | 64f153d547fe5f24d03f37e5766ba41efe140f10 (diff) | |
merge changes for storm-351
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 166b110412..ca0478ee0c 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -351,6 +351,14 @@ public: addText(xpos, ypos, llformat("Time: %d:%02d:%02d", hours,mins,secs)); ypos += y_inc; } +#if LL_WINDOWS + if (gSavedSettings.getBOOL("DebugShowMemory")) + { + addText(xpos, ypos, llformat("Memory: %d (KB)", LLMemory::getWorkingSetSize() / 1024)); + ypos += y_inc; + } +#endif + if (gDisplayCameraPos) { std::string camera_view_text; |