livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Nat Goodspeed 2011-07-12 13:34:09 -04:00
parent 8fcda650a7
commit 4e23550363
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llsys.cpp
View File

@ -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();