diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-11 14:26:33 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-11 14:26:33 -0700 |
| commit | d4b3c23da11dd963915d078b169ac9ac0cf7b7bf (patch) | |
| tree | 2fb1148a7593872d2599754fe0bf87204314bf6a /indra/newview/llchannelmanager.cpp | |
| parent | 85af4c7b7169a0ea38aad5d3759fd36b8ff021f4 (diff) | |
| parent | d348deb7049cbaef7c228000525c7ee5a265464c (diff) | |
Merged lindenlab/viewer-development into default
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(); } //-------------------------------------------------------------------------- |