diff options
| author | simon <none@none> | 2013-08-26 15:45:09 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-26 15:45:09 -0700 |
| commit | 90d1c5b3676fe4e8ea8668b41fdf92613d5f102d (patch) | |
| tree | 8d5afd9678fd44444bcc7b5d311b5cfb7abe5217 /indra/newview/llstartup.cpp | |
| parent | ac2dc34ed0abbac8d5a8eb7f887037fe387c6a7a (diff) | |
| parent | 27d637d0f14fdfff496256222dc1343d2d7ee9ae (diff) | |
Merge downstream code for CHUIStorm
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index cff3a7e02a..67a76460a7 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -51,6 +51,7 @@ #include "lllandmark.h" #include "llcachename.h" #include "lldir.h" +#include "lldonotdisturbnotificationstorage.h" #include "llerrorcontrol.h" #include "llfloaterreg.h" #include "llfocusmgr.h" @@ -68,6 +69,7 @@ #include "llfloaterimnearbychat.h" #include "llnotifications.h" #include "llnotificationsutil.h" +#include "llpersistentnotificationstorage.h" #include "llteleporthistory.h" #include "llregionhandle.h" #include "llsd.h" @@ -900,6 +902,10 @@ bool idle_startup() gDirUtilp->setLindenUserDir(userid); LLFile::mkdir(gDirUtilp->getLindenUserDir()); + // As soon as directories are ready initialize notification storages + LLPersistentNotificationStorage::getInstance()->initialize(); + LLDoNotDisturbNotificationStorage::getInstance()->initialize(); + // Set PerAccountSettingsFile to the default value. gSavedSettings.setString("PerAccountSettingsFile", gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, |