diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-24 13:57:57 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-24 13:57:57 -0700 |
| commit | 31d69a6bc5a81dc3e844138033e41e339dce3aa1 (patch) | |
| tree | 39119d49fcbbaf3cf7fda13b7b62970e1a2a5999 /indra/newview/llviewerobject.h | |
| parent | 6e92b96e88401aaca203b627e84ce311b7f75e4a (diff) | |
| parent | b19e6c295972c83a2637a29007bc5d0a92711ea9 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index e60c8a8d52..22e0de681e 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -198,6 +198,9 @@ public: virtual BOOL updateLOD(); virtual BOOL setDrawableParent(LLDrawable* parentp); F32 getRotTime() { return mRotTime; } +private: + void resetRotTime(); +public: void resetRot(); void applyAngularVelocity(F32 dt); @@ -210,7 +213,7 @@ public: LLViewerRegion* getRegion() const { return mRegionp; } BOOL isSelected() const { return mUserSelected; } - virtual void setSelected(BOOL sel) { mUserSelected = sel; mRotTime = 0.f;} + virtual void setSelected(BOOL sel) { mUserSelected = sel; resetRot();} const LLUUID &getID() const { return mID; } U32 getLocalID() const { return mLocalID; } |