diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-20 14:45:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-20 14:45:47 -0400 |
| commit | c2e902d56ac5d6b6109c1b12254c62ec18ad2199 (patch) | |
| tree | eccb10bb1f2a558270fef9faa87ef1333e2f501a /indra/newview/llviewerobject.h | |
| parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) | |
| parent | 2d28bc112a2db73b521d44e12b3c633cf8eccd7e (diff) | |
merge back beta fixes
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; } |