From f7dc3937cd7bd0cfed83db5df25ddba20481d98d Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 3 Dec 2013 20:27:41 -0800 Subject: SH-4641 FIX Interesting: Incorrect amount of system memory detected on Mac --- indra/llcommon/llsys.cpp | 6 +++--- 1 file 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; -- cgit v1.2.3