Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/lltoolgun.h b/indra/newview/lltoolgun.h
index 8ae926b741..0220d5f327 100644
--- a/indra/newview/lltoolgun.h
+++ b/indra/newview/lltoolgun.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltoolgun.h
  * @brief LLToolGun class header file
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -34,20 +34,20 @@
 class LLToolGun : public LLTool
 {
 public:
-	LLToolGun( LLToolComposite* composite=NULL );
+    LLToolGun( LLToolComposite* composite=NULL );
 
-	virtual void	draw();
+    virtual void    draw();
 
-	virtual void	handleSelect();
-	virtual void	handleDeselect();
+    virtual void    handleSelect();
+    virtual void    handleDeselect();
 
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
+    virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
+    virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
 
-	virtual LLTool*	getOverrideTool(MASK mask) { return NULL; }
-	virtual BOOL	clipMouseWhenDown()		{ return FALSE; }
+    virtual LLTool* getOverrideTool(MASK mask) { return NULL; }
+    virtual BOOL    clipMouseWhenDown()     { return FALSE; }
 private:
-	BOOL mIsSelected;
+    BOOL mIsSelected;
 };
 
 #endif