summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatereditextdaycycle.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-05-24 17:09:01 -0700
committerRider Linden <rider@lindenlab.com>2018-05-24 17:09:01 -0700
commitacaf57100eade61262d73cf5b318c4545e921bd5 (patch)
tree636955754701af7b1421aaf98b3feb59c15fba3f /indra/newview/llfloatereditextdaycycle.cpp
parent581869f2ca01aaa3349baef8785f1b26198d576e (diff)
switch track based on altitudes sent from region.
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 277f2fab52..f4de71426e 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -852,6 +852,7 @@ void LLFloaterEditExtDayCycle::syncronizeTabs()
panel->setSettings(psettingWater);
panel->setEnabled(canedit);
panel->setAllChildrenEnabled(canedit);
+ panel->refresh();
}
}
@@ -883,6 +884,7 @@ void LLFloaterEditExtDayCycle::syncronizeTabs()
panel->setSettings(psettingSky);
panel->setEnabled(canedit);
panel->setAllChildrenEnabled(canedit);
+ panel->refresh();
}
}
@@ -1041,13 +1043,10 @@ void LLFloaterEditExtDayCycle::onIdlePlay(void* user_data)
F32 new_frame = fmod(self->mPlayStartFrame + prcnt_played, 1.f);
self->mTimeSlider->setCurSliderValue(new_frame); // will do the rounding
- self->selectFrame(self->mTimeSlider->getCurSliderValue());
+ self->mSkyBlender->setPosition(new_frame);
+ self->mWaterBlender->setPosition(new_frame);
+ self->syncronizeTabs();
- if (self->mPlayTimer.getElapsedTimeF32() > DAY_CYCLE_PLAY_TIME_SECONDS)
- {
- // Nothing to do anymore.
- self->stopPlay();
- }
}