diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-06-17 15:17:54 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-06-17 15:17:54 +0000 |
| commit | a42a89001d545548eaf1684e73a918badce2837d (patch) | |
| tree | 2650993a565233f5995e6abe44f14d48d48619ac /indra/newview | |
| parent | c9a48a1cdd23a592eb25454d5e2d6c316ec93445 (diff) | |
| parent | 9d9c2037e10966bdf4b07ef3fed081c04a4ed30a (diff) | |
Merged in SL-17485 (pull request #1016)
SL-17485 - MacOS memory accounting
Approved-by: Dave Parks
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewertexture.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index e31bc5ec6e..3584fffd44 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -524,7 +524,7 @@ void LLViewerTexture::getGPUMemoryForTextures(S32Megabytes &gpu, S32Megabytes &p { gpu_res = (S32Megabytes)gViewerWindow->getWindow()->getAvailableVRAMMegabytes(); - //check main memory, only works for windows. + //check main memory, only works for windows and macos. LLMemory::updateMemoryInfo(); physical_res = LLMemory::getAvailableMemKB(); diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 088d11538a..8c41c4a6bc 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -302,7 +302,7 @@ public: }; public: - /*virtual*/ S8 getType() const override ; + /*virtual*/ S8 getType() const override; FTType getFTType() const; /*virtual*/ void forceImmediateUpdate() override; /*virtual*/ void dump() override; |