diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-18 13:15:32 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-18 13:15:32 -0500 |
| commit | fea1d9f4d21ceccb6ebb13270c40ebbae737e769 (patch) | |
| tree | c6e4fa3a9c1f0ff39e3a65e4694b3bb891d2812e /indra/newview/llfloatereditenvironmentbase.cpp | |
| parent | 5fa7f69101a889009194eeddb927599d7536613f (diff) | |
| parent | fe796dac711c7ecdc7d6d17e0b692abf468b754a (diff) | |
SL-20546: Merge branch 'DRTVWR-588-maint-W' into sl-20546.
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(); } } |