diff options
| author | Richard Linden <none@none> | 2013-08-26 18:00:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-26 18:00:24 -0700 |
| commit | 8535b87544cc2e71896716a4cd1c3c2445ff4af0 (patch) | |
| tree | f37bc39df9f6ddf30533a2dfa6f294ebda0a4b41 /indra/llcommon/llmemory.cpp | |
| parent | 662d6a17712fbba5cea0d9cf20f5a2f32e2dd537 (diff) | |
removed some unecessary template parameters from LLUnit member functions
forced unit conversion code to inline
unit conversion now no longer converts all the way to base and back, but tries
to find equivalent units as early as possible
fixed another llinfos instance
scene monitor now outputs n/a for invalid samples
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) |