Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llfloateravatar.h b/indra/newview/llfloateravatar.h
index 76e9372709..0832eef665 100644
--- a/indra/newview/llfloateravatar.h
+++ b/indra/newview/llfloateravatar.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloateravatar.h
  * @author Leyla Farazha
  * @brief floater for the avatar changer
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2011&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2011, 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$
  */
@@ -32,13 +32,13 @@
 class LLMediaCtrl;
 
 class LLFloaterAvatar:
-	public LLFloater
+    public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 private:
-	LLFloaterAvatar(const LLSD& key);
-	/*virtual*/	~LLFloaterAvatar();
-	/*virtual*/	BOOL postBuild();
+    LLFloaterAvatar(const LLSD& key);
+    /*virtual*/ ~LLFloaterAvatar();
+    /*virtual*/ BOOL postBuild();
 
     LLMediaCtrl* mAvatarPicker;
 };