From 9ea022f493fc5e544933ab7caed8eff96b6b74a2 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Thu, 3 May 2007 02:20:59 +0000
Subject: [PATCH] Syncing missing changes in maintenance to release
---
indra/llcharacter/llkeyframemotion.cpp | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index 444007bf072..16a0e71f046 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
{
--
GitLab