diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-08-14 19:10:46 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-14 19:10:46 -0700 |
commit | 094c717ea88c3736f885d8fef417ff73328adc6a (patch) | |
tree | 0e1d728771c276e02215e8f1fe9014e7c929a76d /indra/newview/llviewerobject.h | |
parent | 2e338ef2efcfa2f1812506201d1ff5d61a13310f (diff) |
PATH-842: Another tweak to get the llSetTargetOmega functionality working in the viewer.
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 530d6531f3..05d017dee3 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -212,6 +212,9 @@ public: virtual BOOL updateLOD(); virtual BOOL setDrawableParent(LLDrawable* parentp); F32 getRotTime() { return mRotTime; } +private: + void resetRotTime(); +public: void resetRot(); void applyAngularVelocity(F32 dt); @@ -224,7 +227,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; } |