Merge pull request #1477 from secondlife/marchcat/x-c-merge

Maint X -> Maint C merge

1 files changed, 17 insertions, 17 deletions

diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
index 3f6a86106a..505f276f8c 100644
--- a/indra/newview/llnotificationmanager.cpp
+++ b/indra/newview/llnotificationmanager.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llnotificationmanager.cpp
  * @brief Class implements a brige between the old and a new notification sistems
  *
  * $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$
  */
@@ -39,7 +39,7 @@ using namespace LLNotificationsUI;
 //--------------------------------------------------------------------------
 LLNotificationManager::LLNotificationManager()
 {
-	init();
+    init();
 }
 
 //--------------------------------------------------------------------------
@@ -50,17 +50,17 @@ LLNotificationManager::~LLNotificationManager()
 //--------------------------------------------------------------------------
 void LLNotificationManager::init()
 {
-	mChannels.emplace_back(new LLScriptHandler());
-	mChannels.emplace_back(new LLTipHandler());
-	mChannels.emplace_back(new LLGroupHandler());
-	mChannels.emplace_back(new LLAlertHandler("Alerts", "alert", false));
-	mChannels.emplace_back(new LLAlertHandler("AlertModal", "alertmodal", true));
-	mChannels.emplace_back(new LLOfferHandler());
-	mChannels.emplace_back(new LLHintHandler());
-	mChannels.emplace_back(new LLBrowserNotification());
-	mChannels.emplace_back(new LLIMHandler());
-  
-	mChatHandler = std::shared_ptr<LLFloaterIMNearbyChatHandler>(new LLFloaterIMNearbyChatHandler());
+    mChannels.emplace_back(new LLScriptHandler());
+    mChannels.emplace_back(new LLTipHandler());
+    mChannels.emplace_back(new LLGroupHandler());
+    mChannels.emplace_back(new LLAlertHandler("Alerts", "alert", false));
+    mChannels.emplace_back(new LLAlertHandler("AlertModal", "alertmodal", true));
+    mChannels.emplace_back(new LLOfferHandler());
+    mChannels.emplace_back(new LLHintHandler());
+    mChannels.emplace_back(new LLBrowserNotification());
+    mChannels.emplace_back(new LLIMHandler());
+
+    mChatHandler = std::shared_ptr<LLFloaterIMNearbyChatHandler>(new LLFloaterIMNearbyChatHandler());
 }
 
 //--------------------------------------------------------------------------