From 4031a2d21624db6217d99c495bb0decdac30f1d4 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 23 Sep 2025 10:58:32 +0800 Subject: Minimise whitespace diffs from upstream and remove merge conflict lines. --- indra/newview/llreflectionmapmanager.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/newview/llreflectionmapmanager.cpp') diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp index 87bee62f09..fa4a725fda 100644 --- a/indra/newview/llreflectionmapmanager.cpp +++ b/indra/newview/llreflectionmapmanager.cpp @@ -525,11 +525,8 @@ void LLReflectionMapManager::update() if ((gFrameTimeSeconds - mDefaultProbe->mLastUpdateTime) < sDefaultUpdatePeriod) { -//<<<<<<< HEAD // if (sLevel == 0 && mDefaultProbe->mComplete) -//======= if (mRenderReflectionProbeLevel == 0) -//>>>>>>> Second_Life_Release#17540023-2025.07 { // when probes are disabled don't update the default probe more often than the prescribed update period oldestProbe = nullptr; } -- cgit v1.2.3