summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
authorGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-08-23 14:44:46 -0700
committerGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-08-23 14:44:46 -0700
commit19726783cddb0ac3d34a510c083976e6f9661b49 (patch)
tree5e10d7178d88936475984ce7f5f109631fb2ea3a /indra/llui/llnotifications.cpp
parent2b634d6c45d61f7132fc124e559347a736c6dfda (diff)
MAINT-3046 make LLNotifications clear out vecs of LLNotificationChannelPtr so singleton cleanup doesn't do things it really ought not do
Diffstat (limited to 'indra/llui/llnotifications.cpp')
-rwxr-xr-xindra/llui/llnotifications.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 1789f003b9..0a79f2f588 100755
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1125,7 +1125,7 @@ LLNotificationChannel::LLNotificationChannel(const Params& p)
mName(p.name.isProvided() ? p.name : LLUUID::generateNewID().asString())
{
BOOST_FOREACH(const std::string& source, p.sources)
-{
+ {
connectToChannel(source);
}
}
@@ -1209,6 +1209,10 @@ LLNotifications::LLNotifications()
LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Notification.Show", boost::bind(&LLNotifications::addFromCallback, this, _2));
}
+void LLNotifications::clear()
+{
+ mDefaultChannels.clear();
+}
// The expiration channel gets all notifications that are cancelled
bool LLNotifications::expirationFilter(LLNotificationPtr pNotification)