diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-06-25 10:34:08 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-06-25 10:34:47 +0300 |
| commit | f3deec8851dd03470bf68fcf2cffda1fc3fa44d8 (patch) | |
| tree | 974d50cf0d44f780b9ca812977827dd5af7abab1 /indra | |
| parent | 46e0459c82eaa6444bf79671a41014c4eb83a993 (diff) | |
| parent | 73dc249ab62224f2754f44ddc4db30c1fdc8698c (diff) | |
Merge SL-17663 into DRTVWR-548-maint-N
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index b76dc6a961..1300cf3658 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -2641,7 +2641,7 @@ void LLEnvironment::setExperienceEnvironment(LLUUID experience_id, LLSD data, F3 if (!water.isUndefined()) { - environment->injectWaterSettings(sky, experience_id, LLSettingsBase::Seconds(transition_time)); + environment->injectWaterSettings(water, experience_id, LLSettingsBase::Seconds(transition_time)); } if (updateenvironment) |