summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-05-18 22:18:48 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-05-18 22:18:48 +0300
commit3e72ded0442f26910ee574ebb38cec43d3d9b9bd (patch)
treeca961f7f096af456d0b76ac5a74a87a15db1a17b /indra
parent2b8d3dc6fda2c1d9d1f37a73d24230773e5fe16f (diff)
SL-12007 Missed transparent water in LLFloaterPreference
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterpreference.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 3cf4d0d27e..d1f04007c6 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1317,9 +1317,11 @@ void LLFloaterPreference::refreshEnabledState()
//Deferred/SSAO/Shadows
BOOL bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump") && gSavedSettings.getBOOL("RenderObjectBump");
+ BOOL transparent_water = LLFeatureManager::getInstance()->isFeatureAvailable("RenderTransparentWater") && gSavedSettings.getBOOL("RenderTransparentWater");
BOOL shaders = gSavedSettings.getBOOL("WindLightUseAtmosShaders");
BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
bumpshiny &&
+ transparent_water &&
shaders &&
gGLManager.mHasFramebufferObject &&
gSavedSettings.getBOOL("RenderAvatarVP") &&