diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-09 16:50:26 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-09 16:50:26 +0000 |
| commit | 6f54ebe1c1e6be356740a27eb4035e8c65889d56 (patch) | |
| tree | 500f50222e268c2f2da30f132106eaf4e547087a | |
| parent | 0a4ddfffdc2d77a8dc330bcddeda06a505724bfa (diff) | |
| parent | 4062aba1d0ff9027dcaa76b0a362cf3e54066ff4 (diff) | |
Merged in maxim_productengine/viewer-eep (pull request #136)
SL-9817 and SL-9820
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 15 |
2 files changed, 2 insertions, 14 deletions
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; } 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; |