diff options
| author | Jonathan Yap <none@none> | 2012-02-08 15:41:27 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2012-02-08 15:41:27 -0500 |
| commit | 039c50f2b4831a4caad3313b3e8e1c992793ae90 (patch) | |
| tree | 02ef52d1624324c2e80397f81a9cbf6d3feb31f6 /indra/newview/llinventorybridge.cpp | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
STORM-1807 Play animation floater 2nd play button active while animation is playing
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index cebe93f042..654ebe78fa 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4633,14 +4633,14 @@ void LLAnimationBridge::performAction(LLInventoryModel* model, std::string actio { if (getItem()) { - LLPreviewAnim::e_activation_type activate = LLPreviewAnim::NONE; - if ("playworld" == action) activate = LLPreviewAnim::PLAY; - if ("playlocal" == action) activate = LLPreviewAnim::AUDITION; + LLSD::String activate = "NONE"; + if ("playworld" == action) activate = "Inworld"; + if ("playlocal" == action) activate = "Locally"; LLPreviewAnim* preview = LLFloaterReg::showTypedInstance<LLPreviewAnim>("preview_anim", LLSD(mUUID)); if (preview) { - preview->activate(activate); + preview->play(activate); } } } |