summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2025-05-28 11:52:16 -0400
committerJonathan "Geenz" Goodman <geenz@lindenlab.com>2025-05-28 11:52:16 -0400
commitfe4f85e587fc01319f0570541394eeca57273ba2 (patch)
treea3abfa235b1aad022fa5d262a60d639282635bc8 /indra/newview/llviewerdisplay.cpp
parentaeefc73129978f6f2c1ba8caaff2750eff2cfbb3 (diff)
parentde8275b14b30bf754cdba1da867cb2e6c2783639 (diff)
Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r--indra/newview/llviewerdisplay.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 4d7f376f5c..71830e0948 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -214,11 +214,15 @@ void display_update_camera()
final_far = reflection_probe_draw_distance();
}
else if (CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode())
-
{
final_far *= 0.5f;
}
+ else if (LLViewerTexture::sDesiredDiscardBias > 2.f)
+ {
+ final_far = llmax(32.f, final_far / (LLViewerTexture::sDesiredDiscardBias - 1.f));
+ }
LLViewerCamera::getInstance()->setFar(final_far);
+ LLVOAvatar::sRenderDistance = llclamp(final_far, 16.f, 256.f);
gViewerWindow->setup3DRender();
if (!gCubeSnapshot)