diff options
author | Rider Linden <rider@lindenlab.com> | 2018-08-17 12:35:42 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-08-17 12:35:42 -0700 |
commit | 1716129fd23ff35e030808406af1a8f796dc4b01 (patch) | |
tree | 6b4c71557920032781b9ae6cf19b89acf15f89c3 /indra/newview/llviewermenu.cpp | |
parent | 7f25bef9c4bd5bf277331040711f13eb69b9c6d1 (diff) |
MAINT-8826, MAINT-8990, MAINT-9002, MAINT-7703: Rework for environment pannels in Region/Estate and Parcel. Enable/disable by permission. Edit the correct environment. Dirty flags for changes. Estate owner disallow switch.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index b08eee0ec4..b33da233f5 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -8541,11 +8541,11 @@ class LLWorldEnvPreset : public view_listener_t } else if (item == "new_day_cycle") { - LLFloaterReg::showInstance("env_edit_extdaycycle", "new"); + LLFloaterReg::showInstance("env_edit_extdaycycle", LLSDMap("edit_context", "inventory")); } else if (item == "edit_day_cycle") { - LLFloaterReg::showInstance("env_edit_extdaycycle", "edit"); + LLFloaterReg::showInstance("env_edit_extdaycycle", LLSDMap("edit_context", "inventory")); } else { |