From 28703fc637f4ed71ca60b5911b79bd1842ad720b Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 23 Oct 2023 17:30:51 -0400
Subject: [PATCH] Revert "Temp revert of linden change to fix various env
settings"
This reverts commit b3d190550a583d8bf8770c313dbd7cde0547abbb.
---
indra/newview/llenvironment.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 6350d71fccf..7bc45ffc46f 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -2923,8 +2923,8 @@ void LLEnvironment::DayTransition::animate()
// pause probe updates and reset reflection maps on sky change
- //gPipeline.mReflectionMapManager.pause();
- //gPipeline.mReflectionMapManager.reset();
+ gPipeline.mReflectionMapManager.pause();
+ gPipeline.mReflectionMapManager.reset();
mSky = mStartSky->buildClone();
mBlenderSky = std::make_shared<LLSettingsBlenderTimeDelta>(mSky, mStartSky, mNextInstance->getSky(), mTransitionTime);
@@ -2933,7 +2933,7 @@ void LLEnvironment::DayTransition::animate()
mBlenderSky.reset();
// resume reflection probe updates
- //gPipeline.mReflectionMapManager.resume();
+ gPipeline.mReflectionMapManager.resume();
if (!mBlenderSky && !mBlenderWater)
LLEnvironment::instance().mCurrentEnvironment = mNextInstance;
@@ -3526,8 +3526,8 @@ namespace
mInjectedSky->setSource(target_sky);
// clear reflection probes and pause updates during sky change
- //gPipeline.mReflectionMapManager.pause();
- //gPipeline.mReflectionMapManager.reset();
+ gPipeline.mReflectionMapManager.pause();
+ gPipeline.mReflectionMapManager.reset();
mBlenderSky = std::make_shared<LLSettingsBlenderTimeDelta>(target_sky, start_sky, psky, transition);
mBlenderSky->setOnFinished(
@@ -3537,7 +3537,7 @@ namespace
mInjectedSky->setSource(psky);
// resume updating reflection probes when done animating sky
- //gPipeline.mReflectionMapManager.resume();
+ gPipeline.mReflectionMapManager.resume();
setSky(mInjectedSky);
if (!mBlenderWater && (countExperiencesActive() == 0))
{
--
GitLab