diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-09-23 10:58:32 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-09-23 10:58:32 +0800 |
| commit | 4031a2d21624db6217d99c495bb0decdac30f1d4 (patch) | |
| tree | 9106dc9a57a2500068e8e11f46c7d511d2fb3ca9 /indra/newview/llreflectionmapmanager.cpp | |
| parent | c0876dbee4009ab77c59412c3a2bcf69c154e5d2 (diff) | |
Minimise whitespace diffs from upstream
and remove merge conflict lines.
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; } |