summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-08-04 21:35:57 +0000
committerMonty Brandenberg <monty@lindenlab.com>2014-08-04 21:35:57 +0000
commit8fe0084108202f307291d5d9be586e5186c2b1de (patch)
treeade28d7acd7eaf455657260db2b1dc5768e475e4 /indra/llui/llnotifications.cpp
parent9fb96b416f0612882ddcaa658945a5b3f73ff331 (diff)
parent9a8b1552f0fbff3cde1c8fa5e24924e237008814 (diff)
Merge. Refresh from viewer-library-refresh after 3.7.13 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));
}