summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-20 12:10:05 -0700
committerRichard Linden <none@none>2013-08-20 12:10:05 -0700
commit6d9af374066421a1d8465a57795250a1614adcbb (patch)
treecca215d5414a6922e314e68993db4686119e2760
parentcbaaf4fbdf4d8c80e07b97d17788f1ec6b784d5d (diff)
BUILDFIX: unit assignment error
-rwxr-xr-xindra/llcommon/llmemory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index d46e205500..4b21fa3bda 100755
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -131,8 +131,8 @@ void LLMemory::updateMemoryInfo()
#else
//not valid for other systems for now.
sAllocatedMemInKB = (U32)(LLMemory::getCurrentRSS() / 1024) ;
- sMaxPhysicalMemInKB = U32_MAX ;
- sAvailPhysicalMemInKB = U32_MAX ;
+ sMaxPhysicalMemInKB = (U32Bytes)U32_MAX ;
+ sAvailPhysicalMemInKB = (U32Bytes)U32_MAX ;
#endif
return ;