diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-31 09:33:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-31 09:33:42 -0400 |
| commit | c88f5d26dc894f8d82b948c387a9a3b70862731b (patch) | |
| tree | fd96237f2a595396cd4a2861f976483ea8ef1544 /indra/newview/llviewerdisplay.cpp | |
| parent | aeefc73129978f6f2c1ba8caaff2750eff2cfbb3 (diff) | |
| parent | 39625d10b8a50ed4ca91d618d6ad638b99087e35 (diff) | |
Merge pull request #4176 from secondlife/geenz/2025.04-to-develop
Merge 2025.04 into develop
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 6 |
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) |