diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-08-30 10:46:36 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-08-30 10:46:36 -0500 |
| commit | 197ac7cc2048fe4c259858f48946cd954782dfc2 (patch) | |
| tree | d838e4708ede7d910680b00932b5777d5967838a /indra/llcommon/llsys.h | |
| parent | 302bf29242ef1acd6ef984d78c918a6f4b092a0a (diff) | |
| parent | 14af7cabdb80e1de0f5cb2c7e299bd61bc3321cc (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
Diffstat (limited to 'indra/llcommon/llsys.h')
| -rw-r--r-- | indra/llcommon/llsys.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h index cb92cb0ac6..538e61c521 100644 --- a/indra/llcommon/llsys.h +++ b/indra/llcommon/llsys.h @@ -117,7 +117,10 @@ public: LLMemoryInfo(); ///< Default constructor void stream(std::ostream& s) const; ///< output text info to s - U32Kilobytes getPhysicalMemoryKB() const; + U32Kilobytes getPhysicalMemoryKB() const; +#if LL_DARWIN + static U32Kilobytes getHardwareMemSize(); // Because some Mac linkers won't let us reference extern gSysMemory from a different lib. +#endif //get the available memory infomation in KiloBytes. static void getAvailableMemoryKB(U32Kilobytes& avail_physical_mem_kb, U32Kilobytes& avail_virtual_mem_kb); |