Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

1 files changed, 9 insertions, 8 deletions

diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index a24d97576f..c45c7ed213 100755
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -27,6 +27,7 @@
 #define LLMEMORY_H
 
 #include "linden_common.h"
+#include "llunit.h"
 #if !LL_WINDOWS
 #include <stdint.h>
 #endif
@@ -170,17 +171,17 @@ public:
 	static void logMemoryInfo(BOOL update = FALSE);
 	static bool isMemoryPoolLow();
 
-	static U32 getAvailableMemKB() ;
-	static U32 getMaxMemKB() ;
-	static U32 getAllocatedMemKB() ;
+	static U32Kibibytes getAvailableMemKB() ;
+	static U32Kibibytes getMaxMemKB() ;
+	static U32Kibibytes getAllocatedMemKB() ;
 private:
 	static char* reserveMem;
-	static U32 sAvailPhysicalMemInKB ;
-	static U32 sMaxPhysicalMemInKB ;
-	static U32 sAllocatedMemInKB;
-	static U32 sAllocatedPageSizeInKB ;
+	static U32Kibibytes sAvailPhysicalMemInKB ;
+	static U32Kibibytes sMaxPhysicalMemInKB ;
+	static U32Kibibytes sAllocatedMemInKB;
+	static U32Kibibytes sAllocatedPageSizeInKB ;
 
-	static U32 sMaxHeapSizeInKB;
+	static U32Kibibytes sMaxHeapSizeInKB;
 	static BOOL sEnableMemoryFailurePrevention;
 };