livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-16105 Crash at LLTrackBlenderLoopingManual's setPosition 

User opened editor, pressed play, according to logs environment wasn't loaded yet, asset had yet to arrive.
master
Andrey Kleshchev 2021-09-29 20:13:07 +03:00
parent 85250265f4
commit 1f3d744fdf
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
indra/newview/llfloatereditextdaycycle.cpp
View File

@ -98,6 +98,11 @@ namespace {
const std::string TABS_SKYS("sky_tabs");
const std::string TABS_WATER("water_tabs");
// 'Play' buttons
const std::string BTN_PLAY("play_btn");
const std::string BTN_SKIP_BACK("skip_back_btn");
const std::string BTN_SKIP_FORWARD("skip_forward_btn");
const std::string EVNT_DAYTRACK("DayCycle.Track");
const std::string EVNT_PLAY("DayCycle.PlayActions");
@ -1205,6 +1210,11 @@ void LLFloaterEditExtDayCycle::updateButtons()
mDeleteFrameButton->setEnabled(can_manipulate && isRemovingFrameAllowed());
mLoadFrame->setEnabled(can_manipulate);
BOOL enable_play = mEditDay ? TRUE : FALSE;
childSetEnabled(BTN_PLAY, enable_play);
childSetEnabled(BTN_SKIP_BACK, enable_play);
childSetEnabled(BTN_SKIP_FORWARD, enable_play);
// update track buttons
bool extended_env = LLEnvironment::instance().isExtendedEnvironmentEnabled();
for (S32 track = 0; track < LLSettingsDay::TRACK_MAX; ++track)
@ -1575,15 +1585,22 @@ void LLFloaterEditExtDayCycle::onIdlePlay(void* user_data)
{
LLFloaterEditExtDayCycle* self = (LLFloaterEditExtDayCycle*)user_data;
F32 prcnt_played = self->mPlayTimer.getElapsedTimeF32() / DAY_CYCLE_PLAY_TIME_SECONDS;
F32 new_frame = fmod(self->mPlayStartFrame + prcnt_played, 1.f);
if (self->mSkyBlender == nullptr || self->mWaterBlender == nullptr)
{
self->stopPlay();
}
else
{
self->mTimeSlider->setCurSliderValue(new_frame); // will do the rounding
self->mSkyBlender->setPosition(new_frame);
self->mWaterBlender->setPosition(new_frame);
self->synchronizeTabs();
self->updateTimeAndLabel();
self->updateButtons();
F32 prcnt_played = self->mPlayTimer.getElapsedTimeF32() / DAY_CYCLE_PLAY_TIME_SECONDS;
F32 new_frame = fmod(self->mPlayStartFrame + prcnt_played, 1.f);
self->mTimeSlider->setCurSliderValue(new_frame); // will do the rounding
self->synchronizeTabs();
self->updateTimeAndLabel();
self->updateButtons();
}
}
}

3
indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
View File

@ -342,6 +342,7 @@
width="25">
<button
name="skip_back_btn"
enabled="false"
follows="top"
image_overlay="SkipBackward_Off"
image_disabled="PushButton_Disabled"
@ -373,6 +374,7 @@
width="25">
<button
name="play_btn"
enabled="false"
follows="top"
image_overlay="Play_Off"
image_disabled="PushButton_Disabled"
@ -434,6 +436,7 @@
width="25">
<button
name="skip_forward_btn"
enabled="false"
follows="top"
image_overlay="SkipForward_Off"
image_disabled="PushButton_Disabled"