diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-01-19 11:36:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-19 11:36:56 -0600 |
| commit | 6dd260c3699148b4ddf8e7bff84f4b19f8bbf076 (patch) | |
| tree | 6c9144f701ecb2cda859baaeed4e2f4ee6f9a683 /indra/newview/llfloatereditenvironmentbase.cpp | |
| parent | 45547c7bbadf15804f54bb28fd1c94eb5f080bf5 (diff) | |
| parent | 09ee84f675cf08f98cbd49516c5e01c289b42a20 (diff) | |
Merge branch 'release/materials_featurette' into DRTVWR-592
Diffstat (limited to 'indra/newview/llfloatereditenvironmentbase.cpp')
| -rw-r--r-- | indra/newview/llfloatereditenvironmentbase.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloatereditenvironmentbase.cpp b/indra/newview/llfloatereditenvironmentbase.cpp index cd24d79b7f..e7e0ff717e 100644 --- a/indra/newview/llfloatereditenvironmentbase.cpp +++ b/indra/newview/llfloatereditenvironmentbase.cpp @@ -47,6 +47,7 @@ #include "llsettingsvo.h" #include "llinventorymodel.h" +#include "pipeline.h" namespace { @@ -106,6 +107,9 @@ void LLFloaterEditEnvironmentBase::onFocusReceived() { updateEditEnvironment(); LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT, LLEnvironment::TRANSITION_FAST); + + // HACK -- resume reflection map manager because setSelectedEnvironment may pause it (SL-20456) + gPipeline.mReflectionMapManager.resume(); } } |