summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2018-03-01 14:33:47 -0800
committercallum_linden <none@none>2018-03-01 14:33:47 -0800
commitf4867d032dfe93b249eb188f071cb309e3a7b23e (patch)
tree144bb92ed630302d1d68910069ad2505946eb471 /indra/newview/llfloaterpreference.cpp
parent278382abd72a02b5e190cb259d2b4806f3908902 (diff)
parentf8c76535a35aaf245e261357a59e977bac5b2501 (diff)
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r--indra/newview/llfloaterpreference.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 5222637039..5de7ca5289 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1304,7 +1304,6 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()
BOOL shaders = ctrl_shader_enable->get();
if (shaders)
{
- terrain_detail->setValue(1);
terrain_detail->setEnabled(FALSE);
terrain_text->setEnabled(FALSE);
}