summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2014-04-30 13:56:44 -0400
committerNat Goodspeed <nat@lindenlab.com>2014-04-30 13:56:44 -0400
commit10d50d447c66854243bc3d34ffd758f982c8d296 (patch)
tree156e1078f2f1e9e75eb49edbeea6c4c57d536fc5 /indra/llui/llnotifications.cpp
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
parent220b4166e7f454cfc7937e95c2e7977958f1710e (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 5c288c3f03..99641ae104 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));
}