livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-20456 Fix for probe updates stopping after opening personal lighting or editing a sky setting.

master
RunitaiLinden 2023-10-23 16:10:10 -05:00
parent a29f7c3b4a
commit 4710fcf167
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloatereditenvironmentbase.cpp
View File

@ -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();
}
}

4
indra/newview/llfloaterenvironmentadjust.cpp
View File

@ -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();
}