summaryrefslogtreecommitdiff
path: root/indra/newview/llenvironment.cpp
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-11-30 17:48:08 +0200
committermaxim_productengine <mnikolenko@productengine.com>2018-11-30 17:48:08 +0200
commitd66012f85e885679738cf8c488fd8ff460319c85 (patch)
treebb1941153a12040abb44f66e25a4255e2f7bad54 /indra/newview/llenvironment.cpp
parent58ffb2e4b11d7aaf1fb66531f4925bd359f551cb (diff)
SL-9716 [EEP] "Use Shared Environment" does not enable when applying an environment to a parcel or region
Diffstat (limited to 'indra/newview/llenvironment.cpp')
-rw-r--r--indra/newview/llenvironment.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 580d0e785a..3a030bb09d 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -1731,6 +1731,13 @@ void LLEnvironment::clearExperienceEnvironment(LLUUID experience_id, F32 transit
updateEnvironment(LLSettingsBase::Seconds(transition_time));
}
+void LLEnvironment::setSharedEnvironment()
+{
+ clearEnvironment(LLEnvironment::ENV_LOCAL);
+ setSelectedEnvironment(LLEnvironment::ENV_LOCAL);
+ updateEnvironment();
+}
+
void LLEnvironment::setExperienceEnvironment(LLUUID experience_id, LLUUID asset_id, F32 transition_time)
{
LLSettingsVOBase::getSettingsAsset(asset_id,