From 929abcd296199ab4ed7a0b08166e284502f7b8df Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 10 Jun 2022 16:36:38 -0500
Subject: SL-17523 Add reflection probe ambiance to windlight settings and
integrate with UI and ReflectionMapManager
---
indra/newview/llreflectionmap.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'indra/newview/llreflectionmap.cpp')
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()
--
cgit v1.2.3