summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatereditwater.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloatereditwater.cpp')
-rw-r--r--indra/newview/llfloatereditwater.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloatereditwater.cpp b/indra/newview/llfloatereditwater.cpp
index 2868a0609a..447ec56ce1 100644
--- a/indra/newview/llfloatereditwater.cpp
+++ b/indra/newview/llfloatereditwater.cpp
@@ -52,6 +52,11 @@
#include "v3colorutil.h"
#undef max // Fixes a Windows compiler error
+namespace
+{
+ const F32 SWITCH_TRANSITION(1.0);
+}
+
LLFloaterEditWater::LLFloaterEditWater(const LLSD &key):
LLFloater(key),
@@ -428,7 +433,7 @@ void LLFloaterEditWater::onWaterPresetSelected()
}
pwater = pwater->buildClone();
- LLEnvironment::instance().selectWater(pwater);
+ LLEnvironment::instance().selectWater(pwater, LLEnvironment::TRANSITION_FAST);
syncControls();
enableEditing(true);