summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@geenzo.com>2026-06-30 17:15:12 -0400
committerJonathan "Geenz" Goodman <geenz@geenzo.com>2026-06-30 17:15:12 -0400
commitcd62a49879374c84b66e1ee963e161c3e6109977 (patch)
tree8b023e916f13cd76daa6479ad62e4aac6734a9ff /indra/newview/llviewerdisplay.cpp
parentc299c8038e73e541cafe3c8df135752cb48b903c (diff)
parentc99cd251383ed17b4dd1210ee0701d2a3b4dd0e5 (diff)
Merge branch 'release/26.3' into geenz/texture-streaming-tweaks
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r--indra/newview/llviewerdisplay.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 9dfa9a0efd..4773a8a555 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -217,9 +217,10 @@ void display_update_camera()
{
final_far *= 0.5f;
}
- else if (LLViewerTexture::sDesiredDiscardBias > 2.f)
+ // When system memory is critically low or recovering, shrink draw distance.
+ else if (LLViewerTexture::getSystemMemoryBudgetFactor() > 1.f)
{
- final_far = llmax(32.f, final_far / (LLViewerTexture::sDesiredDiscardBias - 1.f));
+ final_far = llmax(32.f, final_far / LLViewerTexture::getSystemMemoryBudgetFactor());
}
LLViewerCamera::getInstance()->setFar(final_far);
LLVOAvatar::sRenderDistance = llclamp(final_far, 16.f, 256.f);