summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-12-03 20:27:41 -0800
committerRichard Linden <none@none>2013-12-03 20:27:41 -0800
commitf7dc3937cd7bd0cfed83db5df25ddba20481d98d (patch)
tree4aad2630994c477556c22491216cf0cdb31de092
parent3cb64c5038b7cde8bd44ec3a029d477e415085ee (diff)
SH-4641 FIX Interesting: Incorrect amount of system memory detected on Mac
-rwxr-xr-xindra/llcommon/llsys.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index e45f502206..07fe259e47 100755
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -899,17 +899,17 @@ U32Kilobytes LLMemoryInfo::getPhysicalMemoryKB() const
size_t len = sizeof(phys);
sysctl(mib, 2, &phys, &len, NULL, 0);
- return U32Bytes(llmin(phys, (U64)U32_MAX));
+ return U64Bytes(phys);
#elif LL_LINUX
U64 phys = 0;
phys = (U64)(getpagesize()) * (U64)(get_phys_pages());
- return U32Bytes(llmin(phys, (U64)U32_MAX));
+ return U64Bytes(phys);
#elif LL_SOLARIS
U64 phys = 0;
phys = (U64)(getpagesize()) * (U64)(sysconf(_SC_PHYS_PAGES));
- return U32Bytes(llmin(phys, (U64)U32_MAX));
+ return U64Bytes(phys);
#else
return 0;