diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-28 21:23:35 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-28 21:23:35 -0700 |
| commit | 125e216603e949ac97e4d8b649390f7c41a743c0 (patch) | |
| tree | 4a7bfd367fd436738b13bfa6946137b300568a02 /indra/newview/llviewerwindow.cpp | |
| parent | b4b3f78c455a614d7738c29cdc6383e857d6028d (diff) | |
| parent | 948afb8ef436f661dd84e3c343e22934f92570ec (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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; |