summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2019-04-03 14:52:59 -0700
committerRider Linden <rider@lindenlab.com>2019-04-03 14:52:59 -0700
commite24237b6af504ff8faea02c8ab22344f2452364e (patch)
treecda98ca00da4903919fabe14cef3e98fa943089b /indra/newview/llviewermenu.cpp
parent47e3c3aa216f72cae9b940a8f308c7de7c7c695c (diff)
SL-10189, SL-10880: Mark the day instance so that it does not try to reanimate a day cycle when setting a fixed sky. Add new floater for setting the shared environment to local and allowing modifications.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 68a91968ea..f03eb48573 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8542,6 +8542,10 @@ class LLWorldEnvSettings : public view_listener_t
else
LLEnvironment::instance().pauseCloudScroll();
}
+ else if (event_name == "adjust_tool")
+ {
+ LLFloaterReg::showInstance("env_adjust_snapshot");
+ }
else if (event_name == "my_environs")
{
LLFloaterReg::showInstance("my_environments");