diff options
| author | Richard Linden <none@none> | 2013-08-26 18:17:26 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-26 18:17:26 -0700 |
| commit | 1f3f660cf4de95fa7e6cbe4015630640aecd22dd (patch) | |
| tree | 1b64dea44cca08731b0c33b15b90e929c83831d0 /indra/llcommon/llmemory.cpp | |
| parent | cb8c94cc888c432a22af98f9d28d448d66a77a52 (diff) | |
| parent | 8535b87544cc2e71896716a4cd1c3c2445ff4af0 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
| -rwxr-xr-x | indra/llcommon/llmemory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index 06334c012a..cb2f853070 100755 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -206,8 +206,8 @@ bool LLMemory::isMemoryPoolLow() return true ; } - bool is_low = (S32)(sAvailPhysicalMemInKB < LOW_MEMORY_POOL_THRESHOLD || - sAllocatedPageSizeInKB + LOW_MEMORY_POOL_THRESHOLD > sMaxHeapSizeInKB) ; + bool is_low = (S32)(sAvailPhysicalMemInKB < LOW_MEMORY_POOL_THRESHOLD + || sAllocatedPageSizeInKB + LOW_MEMORY_POOL_THRESHOLD > sMaxHeapSizeInKB) ; //check the virtual address space fragmentation if(!is_low) |