summaryrefslogtreecommitdiff
path: root/indra/newview/llvocache.cpp
diff options
context:
space:
mode:
authorHoward Stearns <howard.stearns@gmail.com>2022-05-24 07:04:54 -0700
committerHoward Stearns <howard.stearns@gmail.com>2022-05-24 07:04:54 -0700
commit10f56db475316433586fee273cd442b143a31c08 (patch)
tree0e01d8b9f66855fd16b622c56e1726b25b3e42b0 /indra/newview/llvocache.cpp
parent8ef25a63bd1e84e02fe2c08ce439aa26c0f3d5f1 (diff)
SL-15937 - far must be greater than near near, not equal
Diffstat (limited to 'indra/newview/llvocache.cpp')
-rw-r--r--indra/newview/llvocache.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index 1579eb304e..89dab23399 100644
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -399,9 +399,10 @@ void LLVOCacheEntry::updateDebugSettings()
// a percentage of draw distance beyond which all objects outside of view frustum will be unloaded, regardless of pixel threshold
static LLCachedControl<F32> rear_max_radius_frac(gSavedSettings,"SceneLoadRearMaxRadiusFraction");
+ const F32 min_radius_plus_one = sNearRadius;
const F32 max_radius = rear_max_radius_frac * gAgentCamera.mDrawDistance;
- const F32 clamped_max_radius = llclamp(max_radius, sNearRadius, draw_radius); // [sNearRadius, mDrawDistance]
- sRearFarRadius = sNearRadius + ((clamped_max_radius - sNearRadius) * adjust_factor);
+ const F32 clamped_max_radius = llclamp(max_radius, min_radius_plus_one, draw_radius); // [sNearRadius, mDrawDistance]
+ sRearFarRadius = min_radius_plus_one + ((clamped_max_radius - min_radius_plus_one) * adjust_factor);
//the number of frames invisible objects stay in memory
static LLCachedControl<U32> inv_obj_time(gSavedSettings,"NonvisibleObjectsInMemoryTime");
@@ -503,7 +504,6 @@ void LLVOCacheEntry::calcSceneContribution(const LLVector4a& camera_origin, bool
{
mSceneContrib = 0.f; //out of draw distance, not to load
}
-
}
setVisible();