diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/newview/llmaniptranslate.h | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/llmaniptranslate.h')
| -rw-r--r-- | indra/newview/llmaniptranslate.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llmaniptranslate.h b/indra/newview/llmaniptranslate.h index b1f211d355..8821b64c90 100644 --- a/indra/newview/llmaniptranslate.h +++ b/indra/newview/llmaniptranslate.h @@ -64,9 +64,9 @@ public: virtual void handleSelect(); virtual void handleDeselect(); - EManipPart getHighlightedPart() { return mHighlightedPart; } virtual void highlightManipulators(S32 x, S32 y); - /*virtual*/ BOOL handleMouseDownOnPart(S32 x, S32 y, MASK mask); + virtual BOOL handleMouseDownOnPart(S32 x, S32 y, MASK mask); + virtual BOOL canAffectSelection(); protected: enum EHandleType { @@ -107,7 +107,6 @@ private: LLTimer mUpdateTimer; LLLinkedList<ManipulatorHandle> mProjectedManipulators; LLVector4 mManipulatorVertices[18]; - EManipPart mHighlightedPart; F32 mSnapOffsetMeters; LLVector3 mSnapOffsetAxis; LLQuaternion mGridRotation; |