summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-11-25 15:07:26 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-11-25 15:07:26 -0500
commit7b410df303d37a800ddd0024932729a574a00860 (patch)
tree09a7d7968d560f79324e20ca325b820cc37a67ea /indra/llcharacter
parentc964633a3594c0f2dca8385958a51c471a7ea0db (diff)
SL-124 WIP - cleanup of comments and test code before going to project viewer.
Diffstat (limited to 'indra/llcharacter')
-rwxr-xr-xindra/llcharacter/lljoint.h2
-rwxr-xr-xindra/llcharacter/llkeyframemotion.cpp4
-rwxr-xr-xindra/llcharacter/llmotioncontroller.cpp18
3 files changed, 1 insertions, 23 deletions
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index f11cbacaaa..3282e82cd6 100755
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -44,7 +44,7 @@ const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15;
const U32 LL_CHARACTER_MAX_JOINTS = 152; // must be divisible by 4!
const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110;
-// FIXME BENTO - these should be higher than the joint_num of any
+// These should be higher than the joint_num of any
// other joint, to avoid conflicts in updateMotionsByType()
const U32 LL_HAND_JOINT_NUM = (LL_CHARACTER_MAX_JOINTS-1);
const U32 LL_FACE_JOINT_NUM = (LL_CHARACTER_MAX_JOINTS-2);
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index c227c3f8e9..33d3a7146b 100755
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -2007,7 +2007,6 @@ U32 LLKeyframeMotion::getFileSize()
}
//-----------------------------------------------------------------------------
-// FIXME BENTO TEMP
// dumpToFile()
//-----------------------------------------------------------------------------
void LLKeyframeMotion::dumpToFile(const std::string& name)
@@ -2252,9 +2251,6 @@ void LLKeyframeMotion::onLoadComplete(LLVFS *vfs,
if (motionp->deserialize(dp))
{
motionp->mAssetStatus = ASSET_LOADED;
- // FIXME BENTO TEMP
- //motionp->dumpToFile("");
-
}
else
{
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index eabd7390b1..ea51dcc864 100755
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -377,14 +377,6 @@ LLMotion* LLMotionController::createMotion( const LLUUID &id )
case LLMotion::STATUS_SUCCESS:
// add motion to our list
mLoadedMotions.insert(motion);
- // BENTO TEMP
- {
- LLKeyframeMotion *km = dynamic_cast<LLKeyframeMotion*>(motion);
- if (km)
- {
- //km->dumpToFile("");
- }
- }
break;
default:
LL_ERRS() << "Invalid initialization status" << LL_ENDL;
@@ -584,8 +576,6 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
}
else
{
- // NUM_JOINT_SIGNATURE_STRIDES should be multiple of 4
- // FIXME BENTO - think it's just the number of joints that needs to be a multiple of 4, not the number of strides.
for (S32 i = 0; i < NUM_JOINT_SIGNATURE_STRIDES; i++)
{
U32 *current_signature = (U32*)&(mJointSignature[0][i * 4]);
@@ -789,14 +779,6 @@ void LLMotionController::updateLoadingMotions()
mLoadingMotions.erase(curiter);
// add motion to our loaded motion list
mLoadedMotions.insert(motionp);
- // FIXME BENTO SO MUCH DUMP
- {
- LLKeyframeMotion *km = dynamic_cast<LLKeyframeMotion*>(motionp);
- if (km)
- {
- //km->dumpToFile("");
- }
- }
// this motion should be playing
if (!motionp->isStopped())
{