Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

1 files changed, 69 insertions, 69 deletions

diff --git a/indra/newview/llmaniptranslate.h b/indra/newview/llmaniptranslate.h
index 3c37bbd698..60621c8498 100644
--- a/indra/newview/llmaniptranslate.h
+++ b/indra/newview/llmaniptranslate.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llmaniptranslate.h
  * @brief LLManipTranslate class definition
  *
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -35,80 +35,80 @@
 class LLManipTranslate : public LLManip
 {
 public:
-	class ManipulatorHandle
-	{
-	public:
-		LLVector3	mStartPosition;
-		LLVector3	mEndPosition;
-		EManipPart	mManipID;
-		F32			mHotSpotRadius;
+    class ManipulatorHandle
+    {
+    public:
+        LLVector3   mStartPosition;
+        LLVector3   mEndPosition;
+        EManipPart  mManipID;
+        F32         mHotSpotRadius;
 
-		ManipulatorHandle(LLVector3 start_pos, LLVector3 end_pos, EManipPart id, F32 radius):mStartPosition(start_pos), mEndPosition(end_pos), mManipID(id), mHotSpotRadius(radius){}
-	};
+        ManipulatorHandle(LLVector3 start_pos, LLVector3 end_pos, EManipPart id, F32 radius):mStartPosition(start_pos), mEndPosition(end_pos), mManipID(id), mHotSpotRadius(radius){}
+    };
 
 
-	LLManipTranslate( LLToolComposite* composite );
-	virtual ~LLManipTranslate();
+    LLManipTranslate( LLToolComposite* composite );
+    virtual ~LLManipTranslate();
 
-	static  U32     getGridTexName() ;
-	static  void    destroyGL();
-	static	void	restoreGL();
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual void	render();
-	virtual void	handleSelect();
+    static  U32     getGridTexName() ;
+    static  void    destroyGL();
+    static  void    restoreGL();
+    virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
+    virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
+    virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
+    virtual void    render();
+    virtual void    handleSelect();
 
-	virtual void	highlightManipulators(S32 x, S32 y);
-	virtual BOOL	handleMouseDownOnPart(S32 x, S32 y, MASK mask);
-	virtual BOOL	canAffectSelection();
+    virtual void    highlightManipulators(S32 x, S32 y);
+    virtual BOOL    handleMouseDownOnPart(S32 x, S32 y, MASK mask);
+    virtual BOOL    canAffectSelection();
 
 protected:
-	enum EHandleType {
-		HANDLE_CONE,
-		HANDLE_BOX,
-		HANDLE_SPHERE 
-	};
+    enum EHandleType {
+        HANDLE_CONE,
+        HANDLE_BOX,
+        HANDLE_SPHERE
+    };
 
-	void		renderArrow(S32 which_arrow, S32 selected_arrow, F32 box_size, F32 arrow_size, F32 handle_size, BOOL reverse_direction);
-	void		renderTranslationHandles();
-	void		renderText();
-	void		renderSnapGuides();
-	void		renderGrid(F32 x, F32 y, F32 size, F32 r, F32 g, F32 b, F32 a);
-	void		renderGridVert(F32 x_trans, F32 y_trans, F32 r, F32 g, F32 b, F32 alpha);
-	void		highlightIntersection(LLVector3 normal, 
-									 LLVector3 selection_center, 
-									 LLQuaternion grid_rotation, 
-									 LLColor4 inner_color);
-	F32			getMinGridScale();
+    void        renderArrow(S32 which_arrow, S32 selected_arrow, F32 box_size, F32 arrow_size, F32 handle_size, BOOL reverse_direction);
+    void        renderTranslationHandles();
+    void        renderText();
+    void        renderSnapGuides();
+    void        renderGrid(F32 x, F32 y, F32 size, F32 r, F32 g, F32 b, F32 a);
+    void        renderGridVert(F32 x_trans, F32 y_trans, F32 r, F32 g, F32 b, F32 alpha);
+    void        highlightIntersection(LLVector3 normal,
+                                     LLVector3 selection_center,
+                                     LLQuaternion grid_rotation,
+                                     LLColor4 inner_color);
+    F32         getMinGridScale();
 
 private:
-	S32			mLastHoverMouseX;
-	S32			mLastHoverMouseY;
-	BOOL		mMouseOutsideSlop;		// true after mouse goes outside slop region
-	BOOL		mCopyMadeThisDrag;
-	S32			mMouseDownX;
-	S32			mMouseDownY;
-	F32			mAxisArrowLength;		// pixels
-	F32			mConeSize;				// meters, world space
-	F32			mArrowLengthMeters;		// meters
-	F32			mGridSizeMeters;
-	F32			mPlaneManipOffsetMeters;
-	LLVector3	mManipNormal;
-	LLVector3d	mDragCursorStartGlobal;
-	LLVector3d	mDragSelectionStartGlobal;
-	LLTimer		mUpdateTimer;
-	LLVector4	mManipulatorVertices[18];
-	F32			mSnapOffsetMeters;
-	LLVector3	mSnapOffsetAxis;
-	LLQuaternion mGridRotation;
-	LLVector3	mGridOrigin;
-	LLVector3	mGridScale;
-	F32			mSubdivisions;
-	BOOL		mInSnapRegime;
-	LLVector3	mArrowScales;
-	LLVector3	mPlaneScales;
-	LLVector4	mPlaneManipPositions;
+    S32         mLastHoverMouseX;
+    S32         mLastHoverMouseY;
+    BOOL        mMouseOutsideSlop;      // true after mouse goes outside slop region
+    BOOL        mCopyMadeThisDrag;
+    S32         mMouseDownX;
+    S32         mMouseDownY;
+    F32         mAxisArrowLength;       // pixels
+    F32         mConeSize;              // meters, world space
+    F32         mArrowLengthMeters;     // meters
+    F32         mGridSizeMeters;
+    F32         mPlaneManipOffsetMeters;
+    LLVector3   mManipNormal;
+    LLVector3d  mDragCursorStartGlobal;
+    LLVector3d  mDragSelectionStartGlobal;
+    LLTimer     mUpdateTimer;
+    LLVector4   mManipulatorVertices[18];
+    F32         mSnapOffsetMeters;
+    LLVector3   mSnapOffsetAxis;
+    LLQuaternion mGridRotation;
+    LLVector3   mGridOrigin;
+    LLVector3   mGridScale;
+    F32         mSubdivisions;
+    BOOL        mInSnapRegime;
+    LLVector3   mArrowScales;
+    LLVector3   mPlaneScales;
+    LLVector4   mPlaneManipPositions;
 };
 
 #endif