summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2022-06-24 16:33:54 -0700
committerRider Linden <rider@lindenlab.com>2022-06-24 16:33:54 -0700
commit73dc249ab62224f2754f44ddc4db30c1fdc8698c (patch)
treebd5a5fdfa45b69a9d8785b955a990008e95b4ed4
parentcdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff)
SL-17663: Pass the water settings to the settings injector when an experience changes water settings.
-rw-r--r--indra/newview/llenvironment.cpp2
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)