summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-07-08 17:29:48 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-07-08 17:29:48 -0400
commit29bea5a6b94458e23559bdbeaae5a593100533b6 (patch)
tree5bd356450afd8da159542bfd444b653442004a45 /indra/llui/llnotifications.cpp
parent053f436413c01e237accabace4dc5ff1eccca837 (diff)
parent226929f8f5b8bc1080d0082b2595d689238df2b8 (diff)
Merge. Refresh from viewer-release after 3.7.11 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));
}