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 | |
parent | 47093f6e52741f36fcc782cb52e54baf9f6e3acf (diff) |
SL-109 WIP - code cleanup
-rwxr-xr-x | indra/llcharacter/llbvhloader.cpp | 2 | ||||
-rwxr-xr-x | indra/llcharacter/llkeyframemotion.cpp | 2 | ||||
-rwxr-xr-x | indra/llcharacter/llmotioncontroller.cpp | 4 | ||||
-rwxr-xr-x | indra/newview/app_settings/logcontrol.xml | 1 | ||||
-rwxr-xr-x | indra/newview/llpreviewanim.cpp | 5 |
5 files changed, 7 insertions, 7 deletions
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp index c3346091b8..4dedeeab52 100755 --- a/indra/llcharacter/llbvhloader.cpp +++ b/indra/llcharacter/llbvhloader.cpp @@ -903,7 +903,7 @@ ELoadStatus LLBVHLoader::loadBVHFile(const char *buffer, char* error_text, S32 & return E_ST_NO_CHANNELS; } - // FIXME do we want to open up motion of non-hip joints or + // FIXME BENTO do we want to open up motion of non-hip joints or // not? Already effectively allowed via .anim upload. int res = sscanf(line.c_str(), " CHANNELS %d", &joint->mNumChannels); if ( res != 1 ) diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index d3af4d79e1..c227c3f8e9 100755 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -2253,7 +2253,7 @@ void LLKeyframeMotion::onLoadComplete(LLVFS *vfs, { motionp->mAssetStatus = ASSET_LOADED; // FIXME BENTO TEMP - motionp->dumpToFile(""); + //motionp->dumpToFile(""); } else diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index 0ad34a0965..a3532f9f9c 100755 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -377,12 +377,12 @@ LLMotion* LLMotionController::createMotion( const LLUUID &id ) case LLMotion::STATUS_SUCCESS: // add motion to our list mLoadedMotions.insert(motion); - // FIXME SO MUCH DUMP + // BENTO TEMP { LLKeyframeMotion *km = dynamic_cast<LLKeyframeMotion*>(motion); if (km) { - km->dumpToFile(""); + //km->dumpToFile(""); } } break; 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()); } |