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

FIRE-2083: Slider in upload animation floater doesn't work

Ansariel 2014-03-09 12:54:35 +01:00
parent 8e38881d41
commit 8e57317618
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llfloaterbvhpreview.cpp
View File

@ -153,6 +153,9 @@ LLFloaterBvhPreview::LLFloaterBvhPreview(const std::string& filename) :
mIDList["Surprise"] = ANIM_AGENT_EXPRESS_SURPRISE;
mIDList["Wink"] = ANIM_AGENT_EXPRESS_WINK;
mIDList["Worry"] = ANIM_AGENT_EXPRESS_WORRY;
// <FS:Ansariel> FIRE-2083: Slider in upload animation floater doesn't work
mTimer.stop();
}
//-----------------------------------------------------------------------------
@ -454,6 +457,13 @@ void LLFloaterBvhPreview::draw()
{
mAnimPreview->requestUpdate();
}
// <FS:Ansariel> FIRE-2083: Slider in upload animation floater doesn't work
if (mTimer.getStarted() && mTimer.hasExpired())
{
mTimer.stop();
mPauseRequest = avatarp->requestPause();
}
// </FS:Ansariel>
}
}
@ -687,7 +697,12 @@ void LLFloaterBvhPreview::onSliderMove()
avatarp->deactivateAllMotions();
avatarp->startMotion(base_id, delta_time + BASE_ANIM_TIME_OFFSET);
avatarp->startMotion(mMotionID, delta_time);
mPauseRequest = avatarp->requestPause();
// <FS:Ansariel> FIRE-2083: Slider in upload animation floater doesn't work
//mPauseRequest = avatarp->requestPause();
mPauseRequest = NULL;
mTimer.resetWithExpiry(0.001f);
mTimer.start();
// </FS:Ansariel>
refresh();
}

3
indra/newview/llfloaterbvhpreview.h
View File

@ -129,6 +129,9 @@ protected:
LLAnimPauseRequest mPauseRequest;
std::map<std::string, LLUUID> mIDList;
// <FS:Ansariel> FIRE-2083: Slider in upload animation floater doesn't work
LLFrameTimer mTimer;
};
#endif // LL_LLFLOATERBVHPREVIEW_H