diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:23:00 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:23:00 -0500 |
| commit | 19857d0cf0eedb76cac4eb8a1a4a0b33de9e4235 (patch) | |
| tree | 09d6015fedca390d1a259a9911491087cf088df5 /indra/newview/llflexibleobject.h | |
| parent | 120f31502eb521c1e0abaeb24972f070e7f75bd6 (diff) | |
| parent | 4bbfdd4c1fc18162960ba61fbdad40940a4cdd89 (diff) | |
merge
Diffstat (limited to 'indra/newview/llflexibleobject.h')
| -rw-r--r-- | indra/newview/llflexibleobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llflexibleobject.h b/indra/newview/llflexibleobject.h index 9b952f1985..fef43d464d 100644 --- a/indra/newview/llflexibleobject.h +++ b/indra/newview/llflexibleobject.h @@ -84,7 +84,7 @@ class LLVolumeImplFlexible : public LLVolumeInterface void onSetVolume(const LLVolumeParams &volume_params, const S32 detail); void onSetScale(const LLVector3 &scale, BOOL damped); void onParameterChanged(U16 param_type, LLNetworkData *data, BOOL in_use, bool local_origin); - void onShift(const LLVector3 &shift_vector); + void onShift(const LLVector4a &shift_vector); bool isVolumeUnique() const { return true; } bool isVolumeGlobal() const { return true; } bool isActive() const { return true; } |