summaryrefslogtreecommitdiff
path: root/indra/newview/llflexibleobject.cpp
diff options
context:
space:
mode:
authorDave Parks <none@none>2010-06-08 23:13:05 -0500
committerDave Parks <none@none>2010-06-08 23:13:05 -0500
commitc2da9f5d2cc86af0af34199c53e872fbff22637b (patch)
tree326f7e77cf619eb81c5838791b2e4f0a60a032d4 /indra/newview/llflexibleobject.cpp
parent2cfc9f57bb22ab732cdc55b5e48ff9a05040d05a (diff)
parent22102e41cbf4ce9e1c0d069f111849466e297520 (diff)
Merge with viewer-experimental
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
-rw-r--r--indra/newview/llflexibleobject.cpp6
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;
}
}