Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

1 files changed, 33 insertions, 33 deletions

diff --git a/indra/newview/llfloaterhud.cpp b/indra/newview/llfloaterhud.cpp
index 9de78bb8ab..c5ef187a46 100644
--- a/indra/newview/llfloaterhud.cpp
+++ b/indra/newview/llfloaterhud.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloaterhud.cpp
  * @brief Implementation of HUD floater
  *
  * $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$
  */
@@ -40,42 +40,42 @@
 ///----------------------------------------------------------------------------
 /// Class LLFloaterHUD
 ///----------------------------------------------------------------------------
-#define super LLFloater	/* superclass */
+#define super LLFloater /* superclass */
 
 // Default constructor
 LLFloaterHUD::LLFloaterHUD(const LLSD& key)
-:	LLFloater(key),
-	mWebBrowser(0)
+:   LLFloater(key),
+    mWebBrowser(0)
 {
-	// do not build the floater if there the url is empty
-	if (gSavedSettings.getString("TutorialURL") == "")
-	{
-		LLNotificationsUtil::add("TutorialNotFound");
-		return;
-	}
-	
-	// Opaque background since we never get the focus
-	setBackgroundOpaque(true);
+    // do not build the floater if there the url is empty
+    if (gSavedSettings.getString("TutorialURL") == "")
+    {
+        LLNotificationsUtil::add("TutorialNotFound");
+        return;
+    }
+
+    // Opaque background since we never get the focus
+    setBackgroundOpaque(true);
 }
 
 bool LLFloaterHUD::postBuild()
 {
-	mWebBrowser = getChild<LLMediaCtrl>("floater_hud_browser" );
-	if (mWebBrowser)
-	{
-		// This is a "chrome" floater, so we don't want anything to
-		// take focus (as the user needs to be able to walk with 
-		// arrow keys during tutorial).
-		mWebBrowser->setTakeFocusOnClick(false);
-		
-		std::string language = LLUI::getLanguage();
-		std::string base_url = gSavedSettings.getString("TutorialURL");
-		
-		std::string url = base_url + language + "/";
-		mWebBrowser->navigateTo(url);
-	}
-	
-	return true;
+    mWebBrowser = getChild<LLMediaCtrl>("floater_hud_browser" );
+    if (mWebBrowser)
+    {
+        // This is a "chrome" floater, so we don't want anything to
+        // take focus (as the user needs to be able to walk with
+        // arrow keys during tutorial).
+        mWebBrowser->setTakeFocusOnClick(false);
+
+        std::string language = LLUI::getLanguage();
+        std::string base_url = gSavedSettings.getString("TutorialURL");
+
+        std::string url = base_url + language + "/";
+        mWebBrowser->navigateTo(url);
+    }
+
+    return true;
 }
 
 // Destructor