summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2014-07-10 00:23:01 +0300
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2014-07-10 00:23:01 +0300
commit58c86cf59ee26dbadd359a28d8b16409c856e966 (patch)
tree55d22b0f408f7b0bcda4b5dcefb12ff47bcfd286 /indra/llui/llnotifications.cpp
parent70c2472e427c2d58edd857d298ea9f1fbe4bd41f (diff)
parent226929f8f5b8bc1080d0082b2595d689238df2b8 (diff)
merge changes for 3.7.12-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));
}