From 4710fcf16716ab8d11f7f00e57db21d85d780bb5 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 23 Oct 2023 16:10:10 -0500
Subject: SL-20456 Fix for probe updates stopping after opening personal
lighting or editing a sky setting.
---
indra/newview/llfloatereditenvironmentbase.cpp | 4 ++++
indra/newview/llfloaterenvironmentadjust.cpp | 4 ++++
2 files changed, 8 insertions(+)
(limited to 'indra')
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();
}
}
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();
}
--
cgit v1.2.3