diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-03 02:20:59 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-03 02:20:59 +0000 |
| commit | 9ea022f493fc5e544933ab7caed8eff96b6b74a2 (patch) | |
| tree | fad7f3084aae57b107a8f80bcd2f743ca3ee8123 /indra/llcharacter | |
| parent | d09692bf1d1e68c5c078647e46a19d02b9a72e5d (diff) | |
Syncing missing changes in maintenance to release
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index 444007bf07..16a0e71f04 100644 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -1731,29 +1731,7 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const success &= dp.packVector3(shared_constraintp->mSourceConstraintOffset, "source_offset"); if (shared_constraintp->mConstraintTargetType == TYPE_GROUND) { - success &= dp.packU8(shared_constraintp->mChainLength, "chain_length"); - success &= dp.packU8(shared_constraintp->mConstraintType, "constraint_type"); - char volume_name[16]; /* Flawfinder: ignore */ - snprintf(volume_name, sizeof(volume_name), "%s", /* Flawfinder: ignore */ - mCharacter->findCollisionVolume(shared_constraintp->mSourceConstraintVolume)->getName().c_str()); - success &= dp.packBinaryDataFixed((U8*)volume_name, 16, "source_volume"); - success &= dp.packVector3(shared_constraintp->mSourceConstraintOffset, "source_offset"); - if (shared_constraintp->mConstraintTargetType == TYPE_GROUND) - { - snprintf(volume_name,sizeof(volume_name), "%s", "GROUND"); /* Flawfinder: ignore */ - } - else - { - snprintf(volume_name, sizeof(volume_name),"%s", /* Flawfinder: ignore */ - mCharacter->findCollisionVolume(shared_constraintp->mTargetConstraintVolume)->getName().c_str()); - } - success &= dp.packBinaryDataFixed((U8*)volume_name, 16, "target_volume"); - success &= dp.packVector3(shared_constraintp->mTargetConstraintOffset, "target_offset"); - success &= dp.packVector3(shared_constraintp->mTargetConstraintDir, "target_dir"); - success &= dp.packF32(shared_constraintp->mEaseInStartTime, "ease_in_start"); - success &= dp.packF32(shared_constraintp->mEaseInStopTime, "ease_in_stop"); - success &= dp.packF32(shared_constraintp->mEaseOutStartTime, "ease_out_start"); - success &= dp.packF32(shared_constraintp->mEaseOutStopTime, "ease_out_stop"); + snprintf(volume_name,sizeof(volume_name), "%s", "GROUND"); /* Flawfinder: ignore */ } else { |