summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationmanager.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-03-29 23:56:15 -0700
committerRichard Linden <none@none>2012-03-29 23:56:15 -0700
commit56f9c54c8348786db395ccd464eec17d5b17eeb1 (patch)
tree08d9ebd23121654a9cf4e0561b1256de9bc9b608 /indra/newview/llnotificationmanager.cpp
parent27ce5c301633fa75c32087e347347ab9111aa787 (diff)
parent2fa1c42aadbe2a29e1bcced9a487c0e5abf0602b (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/newview/llnotificationmanager.cpp')
-rw-r--r--indra/newview/llnotificationmanager.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
index 4e77b38757..9beb8afac6 100644
--- a/indra/newview/llnotificationmanager.cpp
+++ b/indra/newview/llnotificationmanager.cpp
@@ -52,16 +52,16 @@ LLNotificationManager::~LLNotificationManager()
//--------------------------------------------------------------------------
void LLNotificationManager::init()
{
- new LLIMHandler();
- new LLScriptHandler();
- new LLTipHandler();
- new LLGroupHandler();
- new LLAlertHandler("Alerts", "alert", false);
- new LLAlertHandler("AlertModal", "alertmodal", true);
- new LLOfferHandler();
- new LLHintHandler();
- new LLBrowserNotification();
- new LLOutboxNotification();
+ mChannels.push_back(new LLScriptHandler());
+ mChannels.push_back(new LLTipHandler());
+ mChannels.push_back(new LLGroupHandler());
+ mChannels.push_back(new LLAlertHandler("Alerts", "alert", false));
+ mChannels.push_back(new LLAlertHandler("AlertModal", "alertmodal", true));
+ 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<LLNearbyChatHandler>(new LLNearbyChatHandler());
}