diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-27 22:00:50 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-27 22:00:50 +0100 |
| commit | 5c2f49b86511f88de520f4297f20e6382139a927 (patch) | |
| tree | 14faba1293222e0594e14be0eeb2e38e724e248c /indra/newview/llfloatereditextdaycycle.cpp | |
| parent | a98d27d976f9cdb07635e7eb7d2c194cf3b7f987 (diff) | |
Make distinct ALM moon shader, tweak mix factor for day vs night moon shading, and fix transposed name of daycycle func.
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 933d5c62ab..d10fe821c8 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; @@ -900,7 +900,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 +924,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) |