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 | |
| parent | c0876dbee4009ab77c59412c3a2bcf69c154e5d2 (diff) | |
Minimise whitespace diffs from upstream
and remove merge conflict lines.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llreflectionmapmanager.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml | 12 |
2 files changed, 6 insertions, 9 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; } diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index 1f59cf0ff3..ec6e7dac24 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -52,7 +52,7 @@ left_delta="330" width="20"> m - </text> + </text> <slider control_name="RenderMaxPartCount" decimal_digits="0" @@ -634,9 +634,9 @@ layout="topleft" left="385" name="vert_border" - top="16" + top="16" width="0"/> - + <text type="string" length="1" @@ -740,7 +740,7 @@ <check_box.commit_callback function="Pref.RenderOptionUpdate" /> </check_box> - + <text type="string" length="1" @@ -759,7 +759,7 @@ height="18" layout="topleft" left_delta="130" - top_delta="0" + top_delta="0" name="ShadowDetail" width="150"> <combo_box.item @@ -793,7 +793,7 @@ <check_box.commit_callback function="Pref.RenderOptionUpdate" /> </check_box> - + <text type="string" length="1" |