diff options
| author | Richard Linden <none@none> | 2013-08-16 12:39:11 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-16 12:39:11 -0700 |
| commit | f8e3a34348ab98ecd56d53360b8f2b6512ad6bba (patch) | |
| tree | c0042514f1242d58cea031be84c23d493f39bb6a /indra/newview/llviewerdisplay.cpp | |
| parent | 52640b85c497e8b0a900ff3f1e051021b5485277 (diff) | |
| parent | 25937040de9a787c221aae7f178f43827c799028 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rwxr-xr-x | indra/newview/llviewerdisplay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 965c6ffbc6..cb5078b988 100755 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -221,8 +221,8 @@ void display_stats() if (mem_log_freq > 0.f && gRecentMemoryTime.getElapsedTimeF32() >= mem_log_freq) { gMemoryAllocated = LLMemory::getCurrentRSS(); - U32 memory = (U32)(gMemoryAllocated / (1024*1024)); - LL_INFOS() << llformat("MEMORY: %d MB", memory) << LL_ENDL; + U32Mibibytes memory = gMemoryAllocated; + LL_INFOS() << llformat("MEMORY: %d MB", memory.value()) << LL_ENDL; LLMemory::logMemoryInfo(TRUE) ; gRecentMemoryTime.reset(); } |