diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-12 11:17:23 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-12 11:17:23 -0400 |
| commit | 932412e1dbc2d684970a1398e140f7d2757e0440 (patch) | |
| tree | a32a9271ad65ae89e0d5620dcf21a34aa3ba6420 /indra/newview | |
| parent | 47093f6e52741f36fcc782cb52e54baf9f6e3acf (diff) | |
SL-109 WIP - code cleanup
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/logcontrol.xml | 1 | ||||
| -rwxr-xr-x | indra/newview/llpreviewanim.cpp | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index 51d6799d71..de3732f339 100755 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -43,7 +43,6 @@ <key>tags</key> <array> <!-- sample entry for debugging specific items - <string>BVH</string> <string>Avatar</string> <string>Inventory</string> <string>SceneLoadTiming</string> diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp index 6c5b82b62e..f83532ea83 100755 --- a/indra/newview/llpreviewanim.cpp +++ b/indra/newview/llpreviewanim.cpp @@ -110,12 +110,13 @@ void LLPreviewAnim::play(const LLSD& param) } else { - // FIXME BENTO - TEMP HACK TO DUMP AS FILE + // BENTO TEMP LLKeyframeMotion *motionp = dynamic_cast<LLKeyframeMotion*>(gAgentAvatarp->findMotion(itemID)); if (motionp && motionp->isLoaded()) { - motionp->dumpToFile(item->getName()); + //motionp->dumpToFile(item->getName()); } + gAgentAvatarp->startMotion(item->getAssetUUID()); } |