diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2011-11-28 11:34:53 -0700 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2011-11-28 11:34:53 -0700 |
commit | fcd232e0fb9ebd18a1d3c967147232912425bc53 (patch) | |
tree | bfb7a9213e8a3da483a42cc69f16fa1a9e185b3c /indra/llcommon | |
parent | a375272ff5cabb97593129523d4e326cb3d0fda2 (diff) | |
parent | 2851cd519338ef4a1fde15da8d4015ab4380d6cb (diff) |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llmemory.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index bb7998c0a8..3b9758f996 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -159,6 +159,7 @@ void LLMemory::logMemoryInfo(BOOL update) if(update) { updateMemoryInfo() ; + LLPrivateMemoryPoolManager::getInstance()->updateStatistics() ; } llinfos << "Current allocated physical memory(KB): " << sAllocatedMemInKB << llendl ; |