aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmanipscale.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llmanipscale.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llmanipscale.h b/linden/indra/newview/llmanipscale.h
index 40c8a53..3ea5ee7 100644
--- a/linden/indra/newview/llmanipscale.h
+++ b/linden/indra/newview/llmanipscale.h
@@ -2,6 +2,8 @@
2 * @file llmanipscale.h 2 * @file llmanipscale.h
3 * @brief LLManipScale class definition 3 * @brief LLManipScale class definition
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 7 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29#ifndef LL_MANIPSCALE_H 32#ifndef LL_MANIPSCALE_H
@@ -75,9 +78,9 @@ public:
75 virtual void handleSelect(); 78 virtual void handleSelect();
76 virtual void handleDeselect(); 79 virtual void handleDeselect();
77 80
78 BOOL handleMouseDownOnPart(S32 x, S32 y, MASK mask); 81 virtual BOOL handleMouseDownOnPart(S32 x, S32 y, MASK mask);
79 EManipPart getHighlightedPart() { return mHighlightedPart; }
80 virtual void highlightManipulators(S32 x, S32 y); // decided which manipulator, if any, should be highlighted by mouse hover 82 virtual void highlightManipulators(S32 x, S32 y); // decided which manipulator, if any, should be highlighted by mouse hover
83 virtual BOOL canAffectSelection();
81 84
82 static void setUniform( BOOL b ); 85 static void setUniform( BOOL b );
83 static BOOL getUniform(); 86 static BOOL getUniform();
@@ -114,8 +117,6 @@ private:
114 F32 partToMinScale( S32 part, const LLBBox& bbox ) const; 117 F32 partToMinScale( S32 part, const LLBBox& bbox ) const;
115 LLVector3 nearestAxis( const LLVector3& v ) const; 118 LLVector3 nearestAxis( const LLVector3& v ) const;
116 119
117 BOOL isSelectionScalable();
118
119 void stretchFace( const LLVector3& drag_start_agent, const LLVector3& drag_delta_agent); 120 void stretchFace( const LLVector3& drag_start_agent, const LLVector3& drag_delta_agent);
120 121
121 void adjustTextureRepeats(); // Adjusts texture coords based on mSavedScale and current scale, only works for boxes 122 void adjustTextureRepeats(); // Adjusts texture coords based on mSavedScale and current scale, only works for boxes
@@ -130,7 +131,6 @@ private:
130 LLVector3d mDragStartCenterGlobal; // The center of the bounding box of all selected objects at time of drag start 131 LLVector3d mDragStartCenterGlobal; // The center of the bounding box of all selected objects at time of drag start
131 LLVector3d mDragPointGlobal; 132 LLVector3d mDragPointGlobal;
132 LLVector3d mDragFarHitGlobal; 133 LLVector3d mDragFarHitGlobal;
133 EManipPart mHighlightedPart;
134 S32 mLastMouseX; 134 S32 mLastMouseX;
135 S32 mLastMouseY; 135 S32 mLastMouseY;
136 BOOL mSendUpdateOnMouseUp; 136 BOOL mSendUpdateOnMouseUp;