diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-10-30 20:09:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-30 20:09:05 -0400 |
| commit | 02f8d44c9c9cf7c1996d509c527a13f143b120c0 (patch) | |
| tree | 1cbca40cedfb2df8cf3b2c7f489b8585c7294693 /indra/newview/llfeaturemanager.cpp | |
| parent | fa055104fc66f7b8779b3d3d399cd9cbb4057e76 (diff) | |
| parent | 1a2f73368ee8298cfb68cdeb114cc9b98f95174b (diff) | |
Merge pull request #4827 from RyeMutt/rye/linux64
Linux Support Part 1
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index ba54d93c75..ac19c08be8 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -464,10 +464,9 @@ bool LLFeatureManager::loadGPUClass() mGPUClass = GPU_CLASS_5; } - #if LL_WINDOWS - const F32Gigabytes MIN_PHYSICAL_MEMORY(2); - LLMemory::updateMemoryInfo(); + #if LL_WINDOWS || LL_LINUX + const F32Gigabytes MIN_PHYSICAL_MEMORY(2); F32Gigabytes physical_mem = LLMemory::getMaxMemKB(); if (MIN_PHYSICAL_MEMORY > physical_mem && mGPUClass > GPU_CLASS_1) { |