From 64942c5cd1e497b19ef44bfb9799059d9d484634 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 4 Apr 2019 18:09:23 +0300
Subject: SL-10875 FIXED [EEP] Selecting the Day Cycle window causes the
 previous keyframe to become selected if keyframes are close together

---
 indra/newview/llfloatereditextdaycycle.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 4b88b4d7af..613ff30c32 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -1151,8 +1151,19 @@ void LLFloaterEditExtDayCycle::selectFrame(F32 frame, F32 slop_factor)
     while (iter != end_iter)
     {
         F32 keyframe = iter->second.mFrame;
-        if (fabs(keyframe - frame) <= slop_factor)
+        F32 frame_dif = fabs(keyframe - frame);
+        if (frame_dif <= slop_factor)
         {
+            keymap_t::iterator next_iter = std::next(iter);
+            if ((frame_dif != 0) && (next_iter != end_iter))
+            {
+                if (fabs(next_iter->second.mFrame - frame) < frame_dif)
+                {
+                    mFramesSlider->setCurSlider(next_iter->first);
+                    frame = next_iter->second.mFrame;
+                    break;
+                }
+            }
             mFramesSlider->setCurSlider(iter->first);
             frame = iter->second.mFrame;  
             break;
@@ -1301,7 +1312,6 @@ void LLFloaterEditExtDayCycle::updateSlider()
     {
         // update positions
         mLastFrameSlider = mFramesSlider->getCurSlider();
-        updateTabs();
     }
     else
     {
-- 
cgit v1.2.3