diff options
Diffstat (limited to 'indra/newview/llfloaterenvironmentadjust.cpp')
-rw-r--r-- | indra/newview/llfloaterenvironmentadjust.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterenvironmentadjust.cpp b/indra/newview/llfloaterenvironmentadjust.cpp index f3133ecb37..c64ee5a69c 100644 --- a/indra/newview/llfloaterenvironmentadjust.cpp +++ b/indra/newview/llfloaterenvironmentadjust.cpp @@ -36,6 +36,7 @@ #include "llvirtualtrackball.h" #include "llenvironment.h" #include "llviewercontrol.h" +#include "pipeline.h" //========================================================================= namespace @@ -134,6 +135,9 @@ void LLFloaterEnvironmentAdjust::onOpen(const LLSD& key) mEventConnection = LLEnvironment::instance().setEnvironmentChanged([this](LLEnvironment::EnvSelection_t env, S32 version){ onEnvironmentUpdated(env, version); }); + // HACK -- resume reflection map manager because "setEnvironmentChanged" may pause it (SL-20456) + gPipeline.mReflectionMapManager.resume(); + LLFloater::onOpen(key); refresh(); } |