diff options
author | Aura Linden <aura@lindenlab.com> | 2014-09-18 17:00:23 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-09-18 17:00:23 -0700 |
commit | 951c83724d7e364ac52cbee2d657711fda7d2c26 (patch) | |
tree | 20b95debd0a3bb52f32df0db52d6dc91caf5793f /indra/newview/llpersistentnotificationstorage.cpp | |
parent | 78304e398fa7d4604eac98247173b33d712ec135 (diff) | |
parent | 61fb8c3fe31c73ce9121daac545aa7c8fc79ec8c (diff) |
Merged in viewer-tiger
Diffstat (limited to 'indra/newview/llpersistentnotificationstorage.cpp')
-rwxr-xr-x | indra/newview/llpersistentnotificationstorage.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpersistentnotificationstorage.cpp b/indra/newview/llpersistentnotificationstorage.cpp index 8658921dc4..9e4f50b7a7 100755 --- a/indra/newview/llpersistentnotificationstorage.cpp +++ b/indra/newview/llpersistentnotificationstorage.cpp @@ -35,7 +35,7 @@ #include "llscreenchannel.h" #include "llscriptfloater.h" #include "llviewermessage.h" - +#include "llviewernetwork.h" LLPersistentNotificationStorage::LLPersistentNotificationStorage() : LLSingleton<LLPersistentNotificationStorage>() , LLNotificationStorage("") @@ -158,7 +158,10 @@ void LLPersistentNotificationStorage::loadNotifications() void LLPersistentNotificationStorage::initialize() { - setFileName(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")); + LLNotifications::instance().getChannel("Persistent")-> connectChanged(boost::bind(&LLPersistentNotificationStorage::onPersistentChannelChanged, this, _1)); } |