diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-30 09:08:56 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-30 09:08:56 -0800 |
| commit | 79049c49bd34d58c3a3140d4fc50f586e45f3047 (patch) | |
| tree | bb1941153a12040abb44f66e25a4255e2f7bad54 /indra/newview/llenvironment.cpp | |
| parent | 65d56f53cd9a2028af177ec0315b721f59868d19 (diff) | |
| parent | d66012f85e885679738cf8c488fd8ff460319c85 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 7 |
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, |