diff options
| author | Aura Linden <aura@lindenlab.com> | 2016-02-23 10:47:21 -0800 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2016-02-23 10:47:21 -0800 |
| commit | a67a01b2a3a8824213d07a303350cc401078b9a9 (patch) | |
| tree | c21db194708c9a83cca4079d11cd35bc82e11bd9 | |
| parent | 4282de6e8572c4b6a9209bbea601c804406a49b8 (diff) | |
MAINT-6162 limit joint offset distances in old style .anim format
| -rwxr-xr-x | indra/llcharacter/llkeyframemotion.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index 0ab716d092..052ca3be58 100755 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -1610,6 +1610,12 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp) if (old_version) { success = dp.unpackVector3(pos_key.mPosition, "pos"); + + //MAINT-6162 + pos_key.mPosition.mV[VX] = llclamp( pos_key.mPosition.mV[VX], -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET); + pos_key.mPosition.mV[VY] = llclamp( pos_key.mPosition.mV[VY], -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET); + pos_key.mPosition.mV[VZ] = llclamp( pos_key.mPosition.mV[VZ], -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET); + } else { |