diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2015-10-01 09:02:45 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2015-10-01 09:02:45 -0700 |
commit | d3928405e3498fabd9215da96fcd0d72e71e83e1 (patch) | |
tree | 218b97ae3d0173a9b8c106c09306aef03f42c7f6 /indra/newview/llpreviewanim.cpp | |
parent | c1e3f778cb377999edf49764088f3f23a2302afc (diff) | |
parent | 6c422a881499c0d7649a59db47905a584bbd2bc1 (diff) |
merge, close develop branch
--HG--
branch : develop
Diffstat (limited to 'indra/newview/llpreviewanim.cpp')
-rwxr-xr-x | indra/newview/llpreviewanim.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp index 35ac0537a3..f83532ea83 100755 --- a/indra/newview/llpreviewanim.cpp +++ b/indra/newview/llpreviewanim.cpp @@ -37,6 +37,7 @@ #include "lllineeditor.h" #include "lluictrlfactory.h" #include "lluictrlfactory.h" +#include "lldatapacker.h" extern LLAgent gAgent; @@ -109,6 +110,13 @@ void LLPreviewAnim::play(const LLSD& param) } else { + // BENTO TEMP + LLKeyframeMotion *motionp = dynamic_cast<LLKeyframeMotion*>(gAgentAvatarp->findMotion(itemID)); + if (motionp && motionp->isLoaded()) + { + //motionp->dumpToFile(item->getName()); + } + gAgentAvatarp->startMotion(item->getAssetUUID()); } |