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

Maint X -> Maint B merge

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/newview/llfloaterhud.h b/indra/newview/llfloaterhud.h
index e560d6320b..b761794295 100644
--- a/indra/newview/llfloaterhud.h
+++ b/indra/newview/llfloaterhud.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloaterhud.h
  * @brief A floater showing the HUD tutorial
  *
  * $LicenseInfo:firstyear=2008&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$
  */
@@ -33,18 +33,18 @@ class LLMediaCtrl;
 
 class LLFloaterHUD : public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 public:
 
-	BOOL postBuild();
-	
+    BOOL postBuild();
+
 private:
-	// Handles its own construction and destruction, so private.
-	LLFloaterHUD(const LLSD& key);
-	/*virtual*/ ~LLFloaterHUD();
+    // Handles its own construction and destruction, so private.
+    LLFloaterHUD(const LLSD& key);
+    /*virtual*/ ~LLFloaterHUD();
 
 private:
-	LLMediaCtrl* mWebBrowser; ///< the actual web browser control
+    LLMediaCtrl* mWebBrowser; ///< the actual web browser control
 };
 
 #endif // LL_LLFLOATERHUD_H