diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-28 09:24:58 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-28 09:24:58 -0700 |
| commit | 1eda16b31989448a211808a8144f0a5ffb0bce49 (patch) | |
| tree | 27333cfb8cdaf28b69e579a87a6f3c321065bafc /indra/newview/llfloatereditextdaycycle.cpp | |
| parent | 438d97714778ebb8728f0ac3808f0b8f98afc1fa (diff) | |
| parent | 0ff65651cc219eef959c5e961663de2a07595e5a (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 933d5c62ab..940933955d 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -358,7 +358,7 @@ void LLFloaterEditExtDayCycle::onAddTrack() std::string sldr_key = mFramesSlider->getCurSlider(); LLSettingsBase::Seconds frame(mTimeSlider->getCurSliderValue()); LLSettingsBase::ptr_t setting; - if ((mEditDay->getSettingsNearKeyfarme(frame, mCurrentTrack, FRAME_SLOP_FACTOR)).second) + if ((mEditDay->getSettingsNearKeyframe(frame, mCurrentTrack, FRAME_SLOP_FACTOR)).second) { LL_WARNS("SETTINGS") << "Attempt to add new frame too close to existing frame." << LL_ENDL; return; @@ -502,9 +502,10 @@ void LLFloaterEditExtDayCycle::onFrameSliderCallback(const LLSD &data) } - - mTimeSlider->setCurSliderValue(sliderpos); + + updateTabs(); + LLEnvironment::instance().updateEnvironment(); } void LLFloaterEditExtDayCycle::onFrameSliderDoubleClick(S32 x, S32 y, MASK mask) @@ -900,7 +901,7 @@ void LLFloaterEditExtDayCycle::synchronizeTabs() if (mCurrentTrack == LLSettingsDay::TRACK_WATER) { canedit = !mIsPlaying; - LLSettingsDay::CycleTrack_t::value_type found = mEditDay->getSettingsNearKeyfarme(frame, LLSettingsDay::TRACK_WATER, FRAME_SLOP_FACTOR); + 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) @@ -924,7 +925,7 @@ void LLFloaterEditExtDayCycle::synchronizeTabs() if (mCurrentTrack != LLSettingsDay::TRACK_WATER) { canedit = !mIsPlaying; - LLSettingsDay::CycleTrack_t::value_type found = mEditDay->getSettingsNearKeyfarme(frame, mCurrentTrack, FRAME_SLOP_FACTOR); + 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) |