Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.

1 files changed, 42 insertions, 42 deletions

diff --git a/indra/newview/llpanelavatartag.h b/indra/newview/llpanelavatartag.h
index 1068ae0b4f..a14b7e9dd2 100644
--- a/indra/newview/llpanelavatartag.h
+++ b/indra/newview/llpanelavatartag.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelavatartag.h
  * @brief Avatar row panel
  *
  * $LicenseInfo:firstyear=2009&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,53 +35,53 @@ class LLTextBox;
 
 /**
  * Avatar Tag panel.
- * 
+ *
  * Test.
- * 
- * Contains avatar name 
+ *
+ * Contains avatar name
  * Provide methods for setting avatar id, state, muted status and speech power.
- */ 
+ */
 class LLPanelAvatarTag : public LLPanel
 {
 public:
-	LLPanelAvatarTag(const LLUUID& key, const std::string im_time);
-	virtual ~LLPanelAvatarTag();
-	
-	/**
-	 * Set avatar ID.
-	 * 
-	 * After the ID is set, it is possible to track the avatar status and get its name.
-	 */
-	void 			setAvatarId(const LLUUID& avatar_id);
-	void            setTime    (const std::string& time);
+    LLPanelAvatarTag(const LLUUID& key, const std::string im_time);
+    virtual ~LLPanelAvatarTag();
+
+    /**
+     * Set avatar ID.
+     *
+     * After the ID is set, it is possible to track the avatar status and get its name.
+     */
+    void            setAvatarId(const LLUUID& avatar_id);
+    void            setTime    (const std::string& time);
 
-	const LLUUID&	getAvatarId() const	{ return mAvatarId; }
+    const LLUUID&   getAvatarId() const { return mAvatarId; }
 
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void draw();	
-	
-	virtual boost::signals2::connection setLeftButtonClickCallback(
-																   const commit_callback_t& cb);
-	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+    /*virtual*/ BOOL postBuild();
+    /*virtual*/ void draw();
 
-	void onClick();
+    virtual boost::signals2::connection setLeftButtonClickCallback(
+                                                                   const commit_callback_t& cb);
+    virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+
+    void onClick();
 private:
-	void setName(const std::string& name);
+    void setName(const std::string& name);
+
+    /**
+     * Called by LLCacheName when the avatar name gets updated.
+     */
+    void nameUpdatedCallback(
+        const LLUUID& id,
+        const std::string& first,
+        const std::string& last,
+        BOOL is_group);
 
-	/**
-	 * Called by LLCacheName when the avatar name gets updated.
-	 */
-	void nameUpdatedCallback(
-		const LLUUID& id,
-		const std::string& first,
-		const std::string& last,
-		BOOL is_group);
-	
-	LLAvatarIconCtrl*		mIcon;			/// status tracking avatar icon
-	LLTextBox*				mName;			/// displays avatar name
-	LLTextBox*				mTime;			/// displays time
-	LLUUID					mAvatarId;
-//	LLFrameTimer			mFadeTimer;
+    LLAvatarIconCtrl*       mIcon;          /// status tracking avatar icon
+    LLTextBox*              mName;          /// displays avatar name
+    LLTextBox*              mTime;          /// displays time
+    LLUUID                  mAvatarId;
+//  LLFrameTimer            mFadeTimer;
 };
 
 #endif