diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 11:00:11 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 11:00:11 -0400 |
| commit | 000a23ba0534fdf9bfc4a1b051b7cee0adceef3e (patch) | |
| tree | 776fe10c7aaf76371a889f79c48c3c9405fd5a4e /indra/llcommon/llsys.h | |
| parent | 7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (diff) | |
| parent | bacf9cfeab90bd1ffad827fa3c34ced985c768a2 (diff) | |
Merge branch 'develop' into release/luau-scripting
Diffstat (limited to 'indra/llcommon/llsys.h')
| -rw-r--r-- | indra/llcommon/llsys.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h index f97d49eeb1..827b0dc048 100644 --- a/indra/llcommon/llsys.h +++ b/indra/llcommon/llsys.h @@ -134,8 +134,8 @@ public: 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); + //get the available memory in KiloBytes. + static void getAvailableMemoryKB(U32Kilobytes& avail_mem_kb); // Retrieve a map of memory statistics. The keys of the map are platform- // dependent. The values are in kilobytes to try to avoid integer overflow. @@ -169,6 +169,7 @@ bool LL_COMMON_API gunzip_file(const std::string& srcfile, const std::string& ds // gzip srcfile into dstfile. Returns false on error. bool LL_COMMON_API gzip_file(const std::string& srcfile, const std::string& dstfile); +extern LL_COMMON_API LLMemoryInfo gSysMemory; extern LL_COMMON_API LLCPUInfo gSysCPU; #endif // LL_LLSYS_H |