summaryrefslogtreecommitdiff
path: root/indra/newview/llchannelmanager.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-12-19 17:54:34 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-12-19 17:54:34 -0800
commit2feff5fe7495dddbaa7878d4e804ad2bea149971 (patch)
tree9549675869d4e7d0807504f294fd4a763b9bb95f /indra/newview/llchannelmanager.cpp
parentcc900b732dd1af2790248485a270197a4006e0f7 (diff)
parentb15ba74485e24db9a996a2f6a9438ac48224ea7a (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
-rw-r--r--indra/newview/llchannelmanager.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp
index dd2bcc742b..43757d0174 100644
--- a/indra/newview/llchannelmanager.cpp
+++ b/indra/newview/llchannelmanager.cpp
@@ -139,7 +139,9 @@ void LLChannelManager::onLoginCompleted()
}
LLPersistentNotificationStorage::getInstance()->loadNotifications();
+
LLDoNotDisturbNotificationStorage::getInstance()->initialize();
+ LLDoNotDisturbNotificationStorage::getInstance()->loadNotifications();
}
//--------------------------------------------------------------------------