diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-04-15 20:43:36 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-04-15 21:40:17 +0300 |
| commit | a99c1e36de575c008ea6f16c74cbcdb99ea29c5b (patch) | |
| tree | 9bead484898af45b810acab964739df3a6878f18 /indra/newview/llfloaterenvironmentadjust.cpp | |
| parent | 206f8d9e01aeadd972d2b279a5e111e0fb418987 (diff) | |
#3887 Fix clouds not updating
setSelectedEnvironment for a default transition was conflicting with
updateEnvironment for an instant transition.
setSelectedEnvironment already has updateEnvironment, so remove the
update and fix time
Diffstat (limited to 'indra/newview/llfloaterenvironmentadjust.cpp')
| -rw-r--r-- | indra/newview/llfloaterenvironmentadjust.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llfloaterenvironmentadjust.cpp b/indra/newview/llfloaterenvironmentadjust.cpp index 35f8340997..aa548a3f42 100644 --- a/indra/newview/llfloaterenvironmentadjust.cpp +++ b/indra/newview/llfloaterenvironmentadjust.cpp @@ -242,9 +242,7 @@ void LLFloaterEnvironmentAdjust::captureCurrentEnvironment() environment.setEnvironment(LLEnvironment::ENV_LOCAL, mLiveSky, FLOATER_ENVIRONMENT_UPDATE); environment.setEnvironment(LLEnvironment::ENV_LOCAL, mLiveWater, FLOATER_ENVIRONMENT_UPDATE); } - environment.setSelectedEnvironment(LLEnvironment::ENV_LOCAL); - environment.updateEnvironment(LLEnvironment::TRANSITION_INSTANT); - + environment.setSelectedEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::TRANSITION_INSTANT); } void LLFloaterEnvironmentAdjust::onButtonReset() @@ -258,7 +256,6 @@ void LLFloaterEnvironmentAdjust::onButtonReset() this->closeFloater(); LLEnvironment::instance().clearEnvironment(LLEnvironment::ENV_LOCAL); LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL); - LLEnvironment::instance().updateEnvironment(); } }); |