diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:04:11 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:04:11 -0500 |
| commit | 37a8c12bd34b2bd119b50f32d6e081ab59d1f5c4 (patch) | |
| tree | ccdc7a5952a55dab7417251b248a25f6ca6fd530 /indra/newview/llflexibleobject.cpp | |
| parent | b3fc9c79f559c84893dede3ce643ac0dfd1f3d65 (diff) | |
| parent | ad5a45624a702433d481c3dbc0f348a8755b367c (diff) | |
merge
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 561965d021..8be4e34748 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -97,11 +97,13 @@ void LLVolumeImplFlexible::onParameterChanged(U16 param_type, LLNetworkData *dat } } -void LLVolumeImplFlexible::onShift(const LLVector3 &shift_vector) +void LLVolumeImplFlexible::onShift(const LLVector4a &shift_vector) { + //VECTORIZE THIS + LLVector3 shift(shift_vector.getF32()); for (int section = 0; section < (1<<FLEXIBLE_OBJECT_MAX_SECTIONS)+1; ++section) { - mSection[section].mPosition += shift_vector; + mSection[section].mPosition += shift; } } |