From fb3dba5a6e41398464d06cd402de4012bd8b733a Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 12 Jul 2018 18:39:35 +0300 Subject: MAINT-8865 Fixed Day Cycle keyframe cannot be deleted --- indra/newview/llfloatereditextdaycycle.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 295788a03a..468c3599ff 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -351,8 +351,6 @@ void LLFloaterEditExtDayCycle::onButtonLoadFrame() void LLFloaterEditExtDayCycle::onAddTrack() { - // todo: 2.5% safety zone - std::string sldr_key = mFramesSlider->getCurSlider(); LLSettingsBase::Seconds frame(mTimeSlider->getCurSliderValue()); LLSettingsBase::ptr_t setting; if ((mEditDay->getSettingsNearKeyframe(frame, mCurrentTrack, FRAME_SLOP_FACTOR)).second) @@ -377,19 +375,18 @@ void LLFloaterEditExtDayCycle::onAddTrack() } addSliderFrame(frame, setting); - reblendSettings(); updateTabs(); } void LLFloaterEditExtDayCycle::onRemoveTrack() { std::string sldr_key = mFramesSlider->getCurSlider(); - if (!sldr_key.empty()) + if (sldr_key.empty()) { return; } removeCurrentSliderFrame(); - updateButtons(); + updateTabs(); } void LLFloaterEditExtDayCycle::onCommitName(class LLLineEditor* caller, void* user_data) @@ -778,9 +775,9 @@ void LLFloaterEditExtDayCycle::removeCurrentSliderFrame() if (iter != mSliderKeyMap.end()) { LL_DEBUGS() << "Removing frame from " << iter->second.mFrame << LL_ENDL; - mSliderKeyMap.erase(iter); LLSettingsBase::Seconds seconds(iter->second.mFrame); mEditDay->removeTrackKeyframe(mCurrentTrack, seconds); + mSliderKeyMap.erase(iter); } mLastFrameSlider = mFramesSlider->getCurSlider(); -- cgit v1.2.3