diff options
author | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
---|---|---|
committer | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
commit | df4f20d4f51e41355e876f734527b4245543415c (patch) | |
tree | 36aaf66ddb96b27fb9701764153cd7d17add275a /indra/newview/llmanipscale.h | |
parent | 0c0391cc7114bd2e9e4462c40e88814326f61bc2 (diff) |
merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
Diffstat (limited to 'indra/newview/llmanipscale.h')
-rw-r--r-- | indra/newview/llmanipscale.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llmanipscale.h b/indra/newview/llmanipscale.h index c02845e358..432be2cd3e 100644 --- a/indra/newview/llmanipscale.h +++ b/indra/newview/llmanipscale.h @@ -76,7 +76,6 @@ public: virtual BOOL handleHover( S32 x, S32 y, MASK mask ); virtual void render(); virtual void handleSelect(); - virtual void handleDeselect(); virtual BOOL handleMouseDownOnPart(S32 x, S32 y, MASK mask); virtual void highlightManipulators(S32 x, S32 y); // decided which manipulator, if any, should be highlighted by mouse hover @@ -140,7 +139,6 @@ private: F32 mBoxHandleSize; // The size of the handles at the corners of the bounding box F32 mScaledBoxHandleSize; // handle size after scaling for selection feedback - EManipPart mManipPart; LLVector3d mDragStartPointGlobal; LLVector3d mDragStartCenterGlobal; // The center of the bounding box of all selected objects at time of drag start LLVector3d mDragPointGlobal; |