summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2014-05-06 16:03:07 -0400
committerNat Goodspeed <nat@lindenlab.com>2014-05-06 16:03:07 -0400
commitb4796595f27f2fdaa71e451aea86bfa386a1f4f7 (patch)
tree62227a271f671eadd210a3f8447ce1062207d8de /indra/llui/llnotifications.cpp
parentd0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff)
parent10d50d447c66854243bc3d34ffd758f982c8d296 (diff)
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/llui/llnotifications.cpp')
-rwxr-xr-xindra/llui/llnotifications.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 025cd81d92..de14391d1f 100755
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1189,6 +1189,7 @@ void LLNotificationChannel::connectToChannel( const std::string& channel_name )
}
else
{
+ mParents.push_back(channel_name);
LLNotificationChannelPtr p = LLNotifications::instance().getChannel(channel_name);
p->connectChanged(boost::bind(&LLNotificationChannelBase::updateItem, this, _1));
}