diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-11 14:18:36 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-11 14:18:36 -0800 |
| commit | 9f8959d480d1069f554c576a4cc9a494559ef1e4 (patch) | |
| tree | 7ae4f550c1039cdb15d0087a0511310dddf8b5a5 /indra/newview/llchannelmanager.cpp | |
| parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) | |
| parent | 573ab07a40acc78e28ae390331d862d3f858bb07 (diff) | |
Pull merge from viewer-chui
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
| -rw-r--r-- | indra/newview/llchannelmanager.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index 987651fc80..43757d0174 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -29,7 +29,8 @@ #include "llchannelmanager.h" #include "llappviewer.h" -#include "llnotificationstorage.h" +#include "lldonotdisturbnotificationstorage.h" +#include "llpersistentnotificationstorage.h" #include "llviewercontrol.h" #include "llviewerwindow.h" #include "llrootview.h" @@ -138,6 +139,9 @@ void LLChannelManager::onLoginCompleted() } LLPersistentNotificationStorage::getInstance()->loadNotifications(); + + LLDoNotDisturbNotificationStorage::getInstance()->initialize(); + LLDoNotDisturbNotificationStorage::getInstance()->loadNotifications(); } //-------------------------------------------------------------------------- |