summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-10-09 16:55:51 +0300
committermaxim_productengine <mnikolenko@productengine.com>2018-10-09 16:55:51 +0300
commit4062aba1d0ff9027dcaa76b0a362cf3e54066ff4 (patch)
treeb53a19d285acee2011f0417ff3363d8409028f63 /indra/newview/llviewermenu.cpp
parent6d1fa8cbf20ec00fba5dc9da8e502d3c9e1c6ab7 (diff)
SL-9820 FIXED [EEP] My Environments finds the parcel's DayCycle unbidden.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp15
1 files changed, 1 insertions, 14 deletions
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;