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/llmanipscale.h | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/llmanipscale.h')
| -rw-r--r-- | indra/newview/llmanipscale.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llmanipscale.h b/indra/newview/llmanipscale.h index 13686fa38d..3ea5ee7d7a 100644 --- a/indra/newview/llmanipscale.h +++ b/indra/newview/llmanipscale.h @@ -78,9 +78,9 @@ public: virtual void handleSelect(); virtual void handleDeselect(); - BOOL handleMouseDownOnPart(S32 x, S32 y, MASK mask); - EManipPart getHighlightedPart() { return mHighlightedPart; } + 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 + virtual BOOL canAffectSelection(); static void setUniform( BOOL b ); static BOOL getUniform(); @@ -117,8 +117,6 @@ private: F32 partToMinScale( S32 part, const LLBBox& bbox ) const; LLVector3 nearestAxis( const LLVector3& v ) const; - BOOL isSelectionScalable(); - void stretchFace( const LLVector3& drag_start_agent, const LLVector3& drag_delta_agent); void adjustTextureRepeats(); // Adjusts texture coords based on mSavedScale and current scale, only works for boxes @@ -133,7 +131,6 @@ private: LLVector3d mDragStartCenterGlobal; // The center of the bounding box of all selected objects at time of drag start LLVector3d mDragPointGlobal; LLVector3d mDragFarHitGlobal; - EManipPart mHighlightedPart; S32 mLastMouseX; S32 mLastMouseY; BOOL mSendUpdateOnMouseUp; |