diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-10-11 14:16:39 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-10-11 14:16:39 +0100 |
| commit | 299592e88e90d0942ba29e1edfa8b72691489e00 (patch) | |
| tree | 7f14e8fce6e7824982233978833b8fe00384912c /indra/newview/llflexibleobject.h | |
| parent | aae13d1966b74adf59e1510bade8652f33e6867e (diff) | |
| parent | b6d22de58850fc9a5b34eeb5b7930e5845bfc42d (diff) | |
merge
Diffstat (limited to 'indra/newview/llflexibleobject.h')
| -rw-r--r-- | indra/newview/llflexibleobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llflexibleobject.h b/indra/newview/llflexibleobject.h index a00551df8e..9383ab03ae 100644 --- a/indra/newview/llflexibleobject.h +++ b/indra/newview/llflexibleobject.h @@ -72,7 +72,6 @@ class LLVolumeImplFlexible : public LLVolumeInterface { private: static std::vector<LLVolumeImplFlexible*> sInstanceList; - static std::vector<S32> sUpdateDelay; S32 mInstanceIndex; public: @@ -133,7 +132,8 @@ private: S32 mInitializedRes; S32 mSimulateRes; S32 mRenderRes; - U32 mFrameNum; + U64 mLastFrameNum; + U32 mLastUpdatePeriod; LLVector3 mCollisionSpherePosition; F32 mCollisionSphereRadius; U32 mID; |