diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-09-24 18:00:01 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-09-24 18:00:01 +0300 |
| commit | ee532d946dc394bd3ebdaefedb6034520b83ef9a (patch) | |
| tree | 84f920ea3cb5fe0d480c1dbe6c2c7c99df07ead5 /indra/newview/llfloatereditextdaycycle.cpp | |
| parent | d0b214fec699cac8b0851e69a87bedb36c895a85 (diff) | |
SL-1817 EEP Day Cycle timeline scrubber can't be repositioned while it's playing
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 5b083e8503..96af840bba 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -184,7 +184,7 @@ BOOL LLFloaterEditExtDayCycle::postBuild() mFlyoutControl->setAction([this](LLUICtrl *ctrl, const LLSD &data) { onButtonApply(ctrl, data); }); getChild<LLButton>(BTN_CANCEL, true)->setCommitCallback([this](LLUICtrl *ctrl, const LLSD &data) { onClickCloseBtn(); }); - mTimeSlider->setCommitCallback([this](LLUICtrl *ctrl, const LLSD &data) { onTimeSliderMoved(); }); + mTimeSlider->setCommitCallback([this](LLUICtrl *ctrl, const LLSD &data) { onTimeSliderCallback(); }); mAddFrameButton->setCommitCallback([this](LLUICtrl *ctrl, const LLSD &data) { onAddTrack(); }); mDeleteFrameButton->setCommitCallback([this](LLUICtrl *ctrl, const LLSD &data) { onRemoveTrack(); }); mImportButton->setCommitCallback([this](LLUICtrl *, const LLSD &){ onButtonImport(); }); @@ -786,8 +786,9 @@ void LLFloaterEditExtDayCycle::checkAndConfirmSettingsLoss(on_confirm_fn cb) } } -void LLFloaterEditExtDayCycle::onTimeSliderMoved() +void LLFloaterEditExtDayCycle::onTimeSliderCallback() { + stopPlay(); selectFrame(mTimeSlider->getCurSliderValue(), LLSettingsDay::DEFAULT_FRAME_SLOP_FACTOR); } |
