Merge for Xcode 7

1 files changed, 3 insertions, 4 deletions

diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
index 152581c5a0..a6f20a9f27 100755
--- a/indra/newview/llnotificationmanager.cpp
+++ b/indra/newview/llnotificationmanager.cpp
@@ -61,7 +61,6 @@ void LLNotificationManager::init()
 	mChannels.push_back(new LLOfferHandler());
 	mChannels.push_back(new LLHintHandler());
 	mChannels.push_back(new LLBrowserNotification());
-	mChannels.push_back(new LLOutboxNotification());
 	mChannels.push_back(new LLIMHandler());
   
 	mChatHandler = boost::shared_ptr<LLFloaterIMNearbyChatHandler>(new LLFloaterIMNearbyChatHandler());
@@ -70,7 +69,7 @@ void LLNotificationManager::init()
 //--------------------------------------------------------------------------
 void LLNotificationManager::onChat(const LLChat& msg, const LLSD &args)
 {
-	if(mChatHandler)
-		mChatHandler->processChat(msg, args);
-		}
+    if(mChatHandler)
+        mChatHandler->processChat(msg, args);
+}