diff options
| author | Thomas Nelson <rider@lindenlab.com> | 2017-10-17 13:38:39 -0700 |
|---|---|---|
| committer | Thomas Nelson <rider@lindenlab.com> | 2017-10-17 13:38:39 -0700 |
| commit | 5754493cdcfeac76d0576abc19bdf5a03717780d (patch) | |
| tree | e6db53ae1cd654f9b2a1a6b9ab47e01ea738ecef /indra/newview/llflexibleobject.h | |
| parent | cc22ffc6d799544e8f2a9dfed6813081d908c88d (diff) | |
| parent | 9c5becd67d7e6fe5f696dcae8690dd562b7b0449 (diff) | |
Merged lindenlab/viewer64 into default
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; |