summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-11-29 17:55:23 +0200
committermaxim_productengine <mnikolenko@productengine.com>2018-11-29 17:55:23 +0200
commit58ffb2e4b11d7aaf1fb66531f4925bd359f551cb (patch)
tree24860ddcc79befa0126239808878c592d2d12fa3
parentace17533c9a847678e8eda50135403e51a132c86 (diff)
SL-10141 FIXED [EEP] Neighboring sky levels may be closer than 100 meters to each other in edit mode
-rw-r--r--indra/llui/llmultislider.cpp4
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_environment.xml1
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index ece6edd285..9a7b6f9f6b 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 18364bbf0b..2f91252d9b 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"