diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-06-18 01:58:20 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-06-18 01:58:20 +0000 |
| commit | c58fd13c63048d96bd0cbf7a2ac4aa286e3e3b96 (patch) | |
| tree | fb2ab844ae6f5f780e77f934431258843c69926d /indra/llcommon/llmemory.cpp | |
| parent | db462d48dd5778d14ba985ce60b2ca24df5b9826 (diff) | |
| parent | 33fe18c335375ecdaf57ddd0138fc7a6cb227843 (diff) | |
Merged in SL-17485-b (pull request #1023)
Make teamcity builds happy by not referencing a newview global from an llcommon file
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
| -rw-r--r-- | indra/llcommon/llmemory.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index 267159e7cc..749b66b472 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -47,9 +47,6 @@ #include "lltrace.h" #include "llerror.h" //---------------------------------------------------------------------------- -#if defined(LL_DARWIN) -extern LLMemoryInfo gSysMemory; -#endif //static U32Kilobytes LLMemory::sAvailPhysicalMemInKB(U32_MAX); @@ -150,8 +147,7 @@ void LLMemory::updateMemoryInfo() // This is what Chrome reports as 'the "Physical Memory Free" value reported by the Memory Monitor in Instruments.' // Note though that inactive pages are not included here and not yet free, but could become so under memory pressure. sAvailPhysicalMemInKB = U32Bytes(vmstat.free_count * page_size); - - sMaxPhysicalMemInKB = gSysMemory.getPhysicalMemoryKB(); + sMaxPhysicalMemInKB = LLMemoryInfo::getHardwareMemSize(); } else { |