diff options
| author | Richard Linden <none@none> | 2013-09-11 16:26:03 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-11 16:26:03 -0700 |
| commit | 420a1af0c86113a7db291022373b69c2b8810c7c (patch) | |
| tree | 21120035ad69f2a54ba72b3c9707856a5957abc0 /indra/llcommon/llsys.cpp | |
| parent | ddd9d1396cd378cbcd332d26d8b6b7092716c1bc (diff) | |
SH-4774 FIX: textures are blurry on Mac
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rwxr-xr-x | indra/llcommon/llsys.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 397ef498d2..7267ba333e 100755 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -868,17 +868,17 @@ U32Kilobytes LLMemoryInfo::getPhysicalMemoryKB() const size_t len = sizeof(phys); sysctl(mib, 2, &phys, &len, NULL, 0); - return U32Bytes(llmax(phys, (U64)U32_MAX)); + return U32Bytes(llmin(phys, (U64)U32_MAX)); #elif LL_LINUX U64 phys = 0; phys = (U64)(getpagesize()) * (U64)(get_phys_pages()); - return U32Bytes(llmax(phys, (U64)U32_MAX)); + return U32Bytes(llmin(phys, (U64)U32_MAX)); #elif LL_SOLARIS U64 phys = 0; phys = (U64)(getpagesize()) * (U64)(sysconf(_SC_PHYS_PAGES)); - return U32Bytes(llmax(phys, (U64)U32_MAX)); + return U32Bytes(llmin(phys, (U64)U32_MAX)); #else return 0; |