summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-07-15 10:15:15 -0700
committerCallum Prentice <callum@lindenlab.com>2014-07-15 10:15:15 -0700
commitedec2d0559905d33907380d0b304b9e28f74082e (patch)
tree8f66c497878a24b488039f54b04f03960fbb6c96 /indra/llui/llnotifications.cpp
parentf11dd1d8a3dc4ba9a3c23563126e11ee971e219f (diff)
parent226929f8f5b8bc1080d0082b2595d689238df2b8 (diff)
Merge with 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));
}