From 6d1fa8cbf20ec00fba5dc9da8e502d3c9e1c6ab7 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 8 Oct 2018 17:06:57 +0300 Subject: SL-9817 FIXED [EEP] Switching by Region/Estate tabs reset Day Cycle settings --- indra/newview/llfloaterregioninfo.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra') diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index c8ed43871d..4fd23252fa 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -191,6 +191,7 @@ public: void refreshFromEstate(); virtual BOOL postBuild() override; + virtual void onOpen(const LLSD& key) override {}; virtual S32 getParcelId() override { return INVALID_PARCEL_ID; } -- cgit v1.2.3 From 4062aba1d0ff9027dcaa76b0a362cf3e54066ff4 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 9 Oct 2018 16:55:51 +0300 Subject: SL-9820 FIXED [EEP] My Environments finds the parcel's DayCycle unbidden. --- indra/newview/llviewermenu.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'indra') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 26f0ec7905..db18d6ed2c 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -8452,20 +8452,7 @@ class LLWorldEnvSettings : public view_listener_t } else if (event_name == "my_environs") { - LLUUID asset_id; - - LLSettingsBase::ptr_t cur(LLEnvironment::instance().getCurrentDay()); - if (!cur) - { - cur = LLEnvironment::instance().getCurrentSky(); - } - - if (cur) - { - asset_id = cur->getAssetId(); - } - - LLFloaterReg::showInstance("my_environments", LLSDMap("asset_id", LLSD::UUID(asset_id))); + LLFloaterReg::showInstance("my_environments"); } return true; -- cgit v1.2.3