summaryrefslogtreecommitdiff
path: root/indra/newview/llreflectionmap.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-06-10 16:36:38 -0500
committerDave Parks <davep@lindenlab.com>2022-06-10 16:36:38 -0500
commit929abcd296199ab4ed7a0b08166e284502f7b8df (patch)
tree900f2a485cce2763a9c7603127fa6380d7ecafb6 /indra/newview/llreflectionmap.cpp
parent5eb6591d0a5252f0bdd1db9ef551a526099b5a99 (diff)
SL-17523 Add reflection probe ambiance to windlight settings and integrate with UI and ReflectionMapManager
Diffstat (limited to 'indra/newview/llreflectionmap.cpp')
-rw-r--r--indra/newview/llreflectionmap.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp
index 500485fc70..4d4eb802f1 100644
--- a/indra/newview/llreflectionmap.cpp
+++ b/indra/newview/llreflectionmap.cpp
@@ -196,15 +196,13 @@ extern LLControlGroup gSavedSettings;
F32 LLReflectionMap::getAmbiance()
{
- static LLCachedControl<F32> minimum_ambiance(gSavedSettings, "RenderReflectionProbeAmbiance", 0.f);
-
F32 ret = 0.f;
if (mViewerObject && mViewerObject->getVolume())
{
ret = ((LLVOVolume*)mViewerObject)->getReflectionProbeAmbiance();
}
- return llmax(ret, minimum_ambiance());
+ return ret;
}
F32 LLReflectionMap::getNearClip()