diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 20:45:23 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 20:45:23 -0400 |
| commit | 09e953a3b7ead5ff5797be80d470b657c61234ea (patch) | |
| tree | ac6db282a64611f417a42f206733f3351f440918 /indra/llcommon/llsys.cpp | |
| parent | 18083bad5cd1915a92e1650bc273db6a52100c6b (diff) | |
| parent | e4996c5d8182a0ef24f0eb445db82121fe5733d7 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 1a66612e87..265c637b69 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -914,22 +914,6 @@ U32Kilobytes LLMemoryInfo::getPhysicalMemoryKB() const #endif } -U32Bytes LLMemoryInfo::getPhysicalMemoryClamped() const -{ - // Return the total physical memory in bytes, but clamp it - // to no more than U32_MAX - - U32Kilobytes phys_kb = getPhysicalMemoryKB(); - if (phys_kb >= U32Gigabytes(4)) - { - return U32Bytes(U32_MAX); - } - else - { - return phys_kb; - } -} - //static void LLMemoryInfo::getAvailableMemoryKB(U32Kilobytes& avail_physical_mem_kb, U32Kilobytes& avail_virtual_mem_kb) { |