From a1fdb88299ffd0631008f6ee6994859831a82148 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 2 Aug 2018 19:58:05 +0300
Subject: MAINT-8945 EEP clicking near a keyframe may activate it without
 highlighting it green

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

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index daf0c931fa..cbdc026cfe 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -975,9 +975,13 @@ void LLFloaterEditExtDayCycle::synchronizeTabs()
     LLTabContainer * tabs = mWaterTabLayoutContainer->getChild<LLTabContainer>(TABS_WATER);
     if (mCurrentTrack == LLSettingsDay::TRACK_WATER)
     {
-        canedit = !mIsPlaying;
-        LLSettingsDay::CycleTrack_t::value_type found = mEditDay->getSettingsNearKeyframe(frame, LLSettingsDay::TRACK_WATER, FRAME_SLOP_FACTOR);
-        psettingW = std::static_pointer_cast<LLSettingsWater>(found.second);
+        if (!mFramesSlider->getCurSlider().empty())
+        {
+            canedit = !mIsPlaying;
+            // either search mEditDay or retrieve from mSliderKeyMap
+            LLSettingsDay::CycleTrack_t::value_type found = mEditDay->getSettingsNearKeyframe(frame, LLSettingsDay::TRACK_WATER, FRAME_SLOP_FACTOR);
+            psettingW = std::static_pointer_cast<LLSettingsWater>(found.second);
+        }
         mCurrentEdit = psettingW;
         if (!psettingW)
         {
@@ -999,9 +1003,13 @@ void LLFloaterEditExtDayCycle::synchronizeTabs()
     tabs = mSkyTabLayoutContainer->getChild<LLTabContainer>(TABS_SKYS);
     if (mCurrentTrack != LLSettingsDay::TRACK_WATER)
     {
-        canedit = !mIsPlaying;
-        LLSettingsDay::CycleTrack_t::value_type found = mEditDay->getSettingsNearKeyframe(frame, mCurrentTrack, FRAME_SLOP_FACTOR);
-        psettingS = std::static_pointer_cast<LLSettingsSky>(found.second);
+        if (!mFramesSlider->getCurSlider().empty())
+        {
+            canedit = !mIsPlaying;
+            // either search mEditDay or retrieve from mSliderKeyMap
+            LLSettingsDay::CycleTrack_t::value_type found = mEditDay->getSettingsNearKeyframe(frame, mCurrentTrack, FRAME_SLOP_FACTOR);
+            psettingS = std::static_pointer_cast<LLSettingsSky>(found.second);
+        }
         mCurrentEdit = psettingS;
         if (!psettingS)
         {
-- 
cgit v1.2.3