diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
| commit | 9e9d32de384b2807f195be48f49fbdec725f45d1 (patch) | |
| tree | 802158bd1a8872500ffeee286256f4c3ff79ef72 /indra/newview/llflexibleobject.h | |
| parent | 3c276c87bde4ff9403df93434e8dc5309a3441b9 (diff) | |
| parent | defbd61d318d0da12fdea208cf2b2297d9a6b122 (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 fef43d464d..371d6a0773 100644 --- a/indra/newview/llflexibleobject.h +++ b/indra/newview/llflexibleobject.h @@ -89,7 +89,7 @@ class LLVolumeImplFlexible : public LLVolumeInterface bool isVolumeGlobal() const { return true; } bool isActive() const { return true; } const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const; - void updateRelativeXform(); + void updateRelativeXform(bool force_identity); void doFlexibleUpdate(); // Called to update the simulation void doFlexibleRebuild(); // Called to rebuild the geometry void preRebuild(); |