diff options
Diffstat (limited to 'indra/newview/llreflectionmapmanager.cpp')
| -rw-r--r-- | indra/newview/llreflectionmapmanager.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
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; } |