diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-09-15 17:55:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-15 17:55:11 -0400 |
| commit | 1073444a44c5d0a877fb91dbdde06aa37fea7644 (patch) | |
| tree | 619c08ac654e73a2ed985b8ce884c538d8990580 /indra/newview/llviewermessage.cpp | |
| parent | fb8cb8f7e8df1738e78bce4a7171b936c44192a9 (diff) | |
| parent | 5c69ae1d66063ee683c5fda4da979f84bc0ce971 (diff) | |
Merge branch 'release/2025.07' into maxim/2025.07-Flat-UI
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index d0e6af799c..16b7ac33b8 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3366,13 +3366,10 @@ void send_agent_update(bool force_send, bool send_reliable) static F32 last_draw_disatance_step = 1024; F32 memory_limited_draw_distance = gAgentCamera.mDrawDistance; - if (LLViewerTexture::sDesiredDiscardBias > 2.f && LLViewerTexture::isSystemMemoryLow()) + if (LLViewerTexture::isSystemMemoryCritical()) { // If we are low on memory, reduce requested draw distance - // Discard's bias is clamped to 4 so we need to check 2 to 4 range - // Factor is intended to go from 1.0 to 2.0 - F32 factor = 1.f + (LLViewerTexture::sDesiredDiscardBias - 2.f) / 2.f; - memory_limited_draw_distance = llmax(gAgentCamera.mDrawDistance / factor, gAgentCamera.mDrawDistance / 2.f); + memory_limited_draw_distance = llmax(gAgentCamera.mDrawDistance / LLViewerTexture::getSystemMemoryBudgetFactor(), gAgentCamera.mDrawDistance / 2.f); } if (tp_state == LLAgent::TELEPORT_ARRIVING || LLStartUp::getStartupState() < STATE_MISC) |