diff options
| author | Don Kjer <don@lindenlab.com> | 2012-07-17 16:52:19 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-07-17 16:52:19 +0000 |
| commit | cff3469d46d297fbec34bc0d648588e900cd255c (patch) | |
| tree | d768ddbc8712c9e81387ae4b03dd8227229a0fe1 /indra/newview/llflexibleobject.h | |
| parent | 5a473a42a63d3277c65bb3bc96e49f020508cfe8 (diff) | |
| parent | 509408f393b8eb58799678adde801675a4d4d600 (diff) | |
Merge viewer-development -> viewer-horde-fixes
Diffstat (limited to 'indra/newview/llflexibleobject.h')
| -rw-r--r-- | indra/newview/llflexibleobject.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llflexibleobject.h b/indra/newview/llflexibleobject.h index 371d6a0773..56d579d86f 100644 --- a/indra/newview/llflexibleobject.h +++ b/indra/newview/llflexibleobject.h @@ -78,7 +78,8 @@ class LLVolumeImplFlexible : public LLVolumeInterface LLVector3 getFramePosition() const; LLQuaternion getFrameRotation() const; LLVolumeInterfaceType getInterfaceType() const { return INTERFACE_FLEXIBLE; } - BOOL doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); + void updateRenderRes(); + void doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); BOOL doUpdateGeometry(LLDrawable *drawable); LLVector3 getPivotPosition() const; void onSetVolume(const LLVolumeParams &volume_params, const S32 detail); @@ -128,7 +129,7 @@ class LLVolumeImplFlexible : public LLVolumeInterface LLVector3 mCollisionSpherePosition; F32 mCollisionSphereRadius; U32 mID; - + //-------------------------------------- // private methods //-------------------------------------- |