diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-10-25 16:57:32 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-10-25 16:57:32 -0700 |
| commit | 86da2f74139438dcc2c10702d4cca63313a34a90 (patch) | |
| tree | f81641e3db923ae7e9b6fbbf683334197fadf284 /indra/newview/llenvironment.cpp | |
| parent | 0cdb792d904198131187d6ead102f951b2894bd0 (diff) | |
| parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) | |
Merge branch 'master' into DRTVWR-489-emoji
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -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) |