diff options
author | simon <none@none> | 2013-12-09 16:11:09 -0800 |
---|---|---|
committer | simon <none@none> | 2013-12-09 16:11:09 -0800 |
commit | 50cba7940fbea7602f6b55df85fb9a2d2b47279b (patch) | |
tree | 269464d15a8d4a8803535b843e8ce7dcac7414cb /indra/newview/llpersistentnotificationstorage.cpp | |
parent | 1a456c2e41905e93e393dc2dda0d143ee7611275 (diff) | |
parent | 4a09065691b6a3461ff2f4541abb3accade207fe (diff) |
Merge in downstream code for 3.6.13
Diffstat (limited to 'indra/newview/llpersistentnotificationstorage.cpp')
-rwxr-xr-x | indra/newview/llpersistentnotificationstorage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpersistentnotificationstorage.cpp b/indra/newview/llpersistentnotificationstorage.cpp index d8fc2bee32..4f7d071d66 100755 --- a/indra/newview/llpersistentnotificationstorage.cpp +++ b/indra/newview/llpersistentnotificationstorage.cpp @@ -149,7 +149,7 @@ void LLPersistentNotificationStorage::loadNotifications() llwarns << "Too many persistent notifications." << " Processed " << gSavedSettings.getS32("MaxPersistentNotifications") << " of " << data.size() << " persistent notifications." << llendl; break; - } + } } LLNotifications::instance().getChannel("Persistent")-> connectChanged(boost::bind(&LLPersistentNotificationStorage::onPersistentChannelChanged, this, _1)); |