diff options
| author | Rye <rye@alchemyviewer.org> | 2025-10-23 02:28:53 -0400 |
|---|---|---|
| committer | Rye <rye@alchemyviewer.org> | 2025-10-27 04:59:15 -0400 |
| commit | be07dee32540c817f70e437cb3482695c53184b3 (patch) | |
| tree | db6ea82ce7eee27ca4a8b7e573e0a15e1cc39d55 | |
| parent | 8c92c6521b037b4e476e8b123f7570c02a9ee9cd (diff) | |
Fix low memory notification appearing incorrectly on non-windows platforms when changing graphics quality levels
Signed-off-by: Rye <rye@alchemyviewer.org>
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 2 |
2 files changed, 3 insertions, 4 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) { diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 99161d8d93..402c84d281 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1354,7 +1354,7 @@ void LLFloaterPreference::onChangeQuality(const LLSD& data) if (level >= LVL_HIGH && mLastQualityLevel < level) { constexpr U32 LOW_MEM_THRESHOLD = 4097; - U32 total_mem = (U32Megabytes)LLMemory::getMaxMemKB(); + U32 total_mem = U32Megabytes(LLMemory::getMaxMemKB()); if (total_mem < LOW_MEM_THRESHOLD) { LLSD args; |