Memory consumption in statistics floater

2012-03-01 13:49:47 +01:00
parent ab26e1008f
commit 251b0fa5c0
5 changed files with 84 additions and 6 deletions
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -83,6 +83,7 @@
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
 #include "llpostprocess.h"
+#include "sgmemstat.h"

 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -229,6 +230,7 @@ void display_stats()
 		U32 memory = (U32)(gMemoryAllocated / (1024*1024));
 		llinfos << llformat("MEMORY: %d MB", memory) << llendl;
 		llinfos << "THREADS: "<< LLThread::getCount() << llendl;
+		llinfos << "MALLOC: " << SGMemStat::getPrintableStat() <<llendl;
 		LLMemory::logMemoryInfo(TRUE) ;
 		gRecentMemoryTime.reset();
 	}