diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-07-12 13:34:09 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-07-12 13:34:09 -0400 |
| commit | 4e2355036358ed712dd7df2668ec705931ad13a1 (patch) | |
| tree | 5519a75f8d43b0313c233e2fe2bc2c9dcd3c625d /indra | |
| parent | 8fcda650a71d4784dcb24e86b3fc59ad15bc6a2d (diff) | |
CHOP-753: make getAvailableMemoryKB() only load data on Windows.
(per Monty code review)
Other platforms return -1 anyway, so don't need to call load methods.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 9390fc170c..aa71590eae 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -755,11 +755,11 @@ U32 LLMemoryInfo::getPhysicalMemoryClamped() const //static void LLMemoryInfo::getAvailableMemoryKB(U32& avail_physical_mem_kb, U32& avail_virtual_mem_kb) { +#if LL_WINDOWS // Sigh, this shouldn't be a static method, then we wouldn't have to // reload this data separately from refresh() LLSD statsMap(loadStatsMap(loadStatsArray())); -#if LL_WINDOWS avail_physical_mem_kb = statsMap["Avail Physical KB"].asInteger(); avail_virtual_mem_kb = statsMap["Avail Virtual KB"].asInteger(); |