Merge tag '7.1.7-release'

source for viewer 7.1.7.8974243247

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llhints.h b/indra/newview/llhints.h
index 1f730734d0..e661ef304b 100644
--- a/indra/newview/llhints.h
+++ b/indra/newview/llhints.h
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2000&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 LLHints :  public LLSingleton<LLHints>
 {
-	LLSINGLETON(LLHints);
-	~LLHints();
+    LLSINGLETON(LLHints);
+    ~LLHints();
 public:
-	void show(LLNotificationPtr hint);
-	void hide(LLNotificationPtr hint);
-	void registerHintTarget(const std::string& name, LLHandle<LLView> target);
-	LLHandle<LLView> getHintTarget(const std::string& name);
+    void show(LLNotificationPtr hint);
+    void hide(LLNotificationPtr hint);
+    void registerHintTarget(const std::string& name, LLHandle<LLView> target);
+    LLHandle<LLView> getHintTarget(const std::string& name);
 private:
-	LLRegistry<std::string, LLHandle<LLView> > mTargetRegistry;
-	typedef std::map<LLNotificationPtr, class LLHintPopup*> hint_map_t;
-	hint_map_t mHints;
-	void showHints(const LLSD& show);
+    LLRegistry<std::string, LLHandle<LLView> > mTargetRegistry;
+    typedef std::map<LLNotificationPtr, class LLHintPopup*> hint_map_t;
+    hint_map_t mHints;
+    void showHints(const LLSD& show);
 
-	boost::signals2::connection mControlConnection;
+    boost::signals2::connection mControlConnection;
 };