Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 17 insertions, 17 deletions

diff --git a/indra/newview/llnotificationmanager.h b/indra/newview/llnotificationmanager.h
index cf987ff4e9..d7d192eca0 100644
--- a/indra/newview/llnotificationmanager.h
+++ b/indra/newview/llnotificationmanager.h
@@ -1,26 +1,26 @@
 // Notification Manager Class
-/** 
+/**
  * @file llnotificationmanager.h
  * @brief Class implements a brige between the old and a new notification sistems
  *
  * $LicenseInfo:firstyear=2003&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$
  */
@@ -44,22 +44,22 @@ class LLToast;
  */
 class LLNotificationManager : public LLSingleton<LLNotificationManager>
 {
-	LLSINGLETON(LLNotificationManager);
-	virtual ~LLNotificationManager();
-	typedef std::pair<std::string, LLEventHandler*> eventhandlers;
+    LLSINGLETON(LLNotificationManager);
+    virtual ~LLNotificationManager();
+    typedef std::pair<std::string, LLEventHandler*> eventhandlers;
 
 public:
-	//TODO: make private
-	// this method initialize handlers' map for different types of notifications
-	void init(void);
-	//TODO: combine processing and storage (*)
-	
-	// this method reacts on chat notifications and calls an appropriate handler
-	void onChat(const LLChat& msg, const LLSD &args);
+    //TODO: make private
+    // this method initialize handlers' map for different types of notifications
+    void init(void);
+    //TODO: combine processing and storage (*)
+
+    // this method reacts on chat notifications and calls an appropriate handler
+    void onChat(const LLChat& msg, const LLSD &args);
 
 private:
-	std::shared_ptr<class LLFloaterIMNearbyChatHandler> mChatHandler;
-	std::vector<LLNotificationChannelPtr> mChannels;
+    std::shared_ptr<class LLFloaterIMNearbyChatHandler> mChatHandler;
+    std::vector<LLNotificationChannelPtr> mChannels;
 };
 
 }