From be07dee32540c817f70e437cb3482695c53184b3 Mon Sep 17 00:00:00 2001 From: Rye Date: Thu, 23 Oct 2025 02:28:53 -0400 Subject: Fix low memory notification appearing incorrectly on non-windows platforms when changing graphics quality levels Signed-off-by: Rye --- indra/newview/llfeaturemanager.cpp | 5 ++--- 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; -- cgit v1.3