diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-11 09:49:57 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-11 09:49:57 +0200 |
| commit | b0af6b8acb33c86e5ac8d693131b5c9e7d9407b5 (patch) | |
| tree | dbe58da2c0ff07a8950548a513db31806f0308d4 /indra/llcharacter | |
| parent | d3bde04a8c3a2cd142bb75dbcad577d083aad0d1 (diff) | |
| parent | abae31cb4a26500012663cdc2a06a290ac4e46c9 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llcharacter.cpp | 4 | ||||
| -rw-r--r-- | indra/llcharacter/lleditingmotion.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp index 528a7bb4a5..40a9752268 100644 --- a/indra/llcharacter/llcharacter.cpp +++ b/indra/llcharacter/llcharacter.cpp @@ -181,16 +181,18 @@ void LLCharacter::requestStopMotion( LLMotion* motion) // updateMotions() //----------------------------------------------------------------------------- static LLFastTimer::DeclareTimer FTM_UPDATE_ANIMATION("Update Animation"); +static LLFastTimer::DeclareTimer FTM_UPDATE_HIDDEN_ANIMATION("Update Hidden Anim"); void LLCharacter::updateMotions(e_update_t update_type) { - LLFastTimer t(FTM_UPDATE_ANIMATION); if (update_type == HIDDEN_UPDATE) { + LLFastTimer t(FTM_UPDATE_HIDDEN_ANIMATION); mMotionController.updateMotionsMinimal(); } else { + LLFastTimer t(FTM_UPDATE_ANIMATION); // unpause if the number of outstanding pause requests has dropped to the initial one if (mMotionController.isPaused() && mPauseRequest->getNumRefs() == 1) { diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp index 381d19e614..57554bdc35 100644 --- a/indra/llcharacter/lleditingmotion.cpp +++ b/indra/llcharacter/lleditingmotion.cpp @@ -221,7 +221,7 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask) if (!target.isFinite()) { llerrs << "Non finite target in editing motion with target distance of " << target_dist << - " and focus point " << focus_pt << " and pointAtPt: " << *pointAtPt << llendl; + " and focus point " << focus_pt << llendl; } mTarget.setPosition( target + mParentJoint.getPosition()); |