diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-01-24 16:52:29 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-01-24 16:52:29 +0000 |
| commit | fec246a2e6d380971080d95446cc55059be01352 (patch) | |
| tree | 358eca34c63a9256a26acadd0b3e379cb60dc0be /indra/newview/llpersistentnotificationstorage.cpp | |
| parent | 67dc2924bf6f004326f8e22d1d92c4a071c946a4 (diff) | |
| parent | 5ab34ccc5a5ec0abd6526b16379d7e29d8668ec4 (diff) | |
Merged DRTVWR-544-maint into SL-316
Diffstat (limited to 'indra/newview/llpersistentnotificationstorage.cpp')
| -rw-r--r-- | indra/newview/llpersistentnotificationstorage.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llpersistentnotificationstorage.cpp b/indra/newview/llpersistentnotificationstorage.cpp index f95ab9928d..b6549800a2 100644 --- a/indra/newview/llpersistentnotificationstorage.cpp +++ b/indra/newview/llpersistentnotificationstorage.cpp @@ -167,12 +167,16 @@ void LLPersistentNotificationStorage::loadNotifications() LL_INFOS("LLPersistentNotificationStorage") << "finished loading notifications" << LL_ENDL; } -void LLPersistentNotificationStorage::initialize() +void LLPersistentNotificationStorage::reset() { - std::string file_name = "open_notifications_" + LLGridManager::getInstance()->getGrid() + ".xml"; - setFileName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, file_name)); - setOldFileName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "open_notifications.xml")); + std::string file_name = "open_notifications_" + LLGridManager::getInstance()->getGrid() + ".xml"; + setFileName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, file_name)); + setOldFileName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "open_notifications.xml")); +} +void LLPersistentNotificationStorage::initialize() +{ + reset(); LLNotifications::instance().getChannel("Persistent")-> connectChanged(boost::bind(&LLPersistentNotificationStorage::onPersistentChannelChanged, this, _1)); } |