summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2023-08-30 12:57:48 -0500
committerRunitaiLinden <davep@lindenlab.com>2023-08-30 12:57:48 -0500
commit75a0719ff59118c0a5c6713e952cab4d0640a7d5 (patch)
tree60a8c2108fa7559c09a128c0a83ebbf7bd48518e /indra
parent2ce27627a18787113c1b9a1fd99b5a516d693a8c (diff)
SL-19842 Followup -- less aggressive ambient kill.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/settings.xml2
-rw-r--r--indra/newview/llreflectionmap.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ee4c76943e..b4e149f0e0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10654,7 +10654,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.5</real>
+ <real>0.7</real>
</map>
<key>RenderSkyAutoAdjustHDRScale</key>
<map>
diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp
index 2a2f4dbd5a..ec54fa1165 100644
--- a/indra/newview/llreflectionmap.cpp
+++ b/indra/newview/llreflectionmap.cpp
@@ -157,6 +157,9 @@ void LLReflectionMap::autoAdjustOrigin()
}
mRadius = llmax(sqrtf(r2.getF32()), 8.f);
+
+ // make sure near clip doesn't poke through ground
+ fp[2] = llmax(fp[2], height+mRadius*0.5f);
}
}