From 58ffb2e4b11d7aaf1fb66531f4925bd359f551cb Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 29 Nov 2018 17:55:23 +0200
Subject: [PATCH] SL-10141 FIXED [EEP] Neighboring sky levels may be closer
than 100 meters to each other in edit mode
---
indra/llui/llmultislider.cpp | 4 ++--
.../newview/skins/default/xui/en/panel_region_environment.xml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index ece6edd285d..9a7b6f9f6bb 100644
--- a/indra/llui/llmultislider.cpp
+++ b/indra/llui/llmultislider.cpp
@@ -113,9 +113,9 @@ LLMultiSlider::LLMultiSlider(const LLMultiSlider::Params& p)
setMouseUpCallback(initCommitCallback(p.mouse_up_callback));
}
- if (p.overlap_threshold.isProvided())
+ if (p.overlap_threshold.isProvided() && p.overlap_threshold > mIncrement)
{
- mOverlapThreshold = p.overlap_threshold;
+ mOverlapThreshold = p.overlap_threshold - mIncrement;
}
else
{
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 18364bbf0b5..2f91252d9b1 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -252,6 +252,7 @@
width="17"
orientation="vertical"
increment="10"
+ overlap_threshold="100"
min_val="100"
max_val="4000"
layout="topleft"
--
GitLab