diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-07-09 15:54:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-09 15:54:18 -0500 |
| commit | e6e41e71b7bc860faee8cd13c56f7180e8eb4745 (patch) | |
| tree | 57921be1de663dbcf0dd1ff1fb10aa1dd4c4dda7 /indra/llcommon/llsys.h | |
| parent | 21f40280eca12bca53e9894f01cac2e205bb2827 (diff) | |
#1943 make sys free in texture console llmemorysavailphysicalmeminkb tell the truth (#1966)
* Also fix for crash when applying MoaP to PBR material
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 |