diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-07-09 15:22:12 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-07-09 15:22:12 -0700 |
| commit | 487fce4afaed69268db4fb996e420ba8984101d3 (patch) | |
| tree | 365a4d16f511c083334b5315c6ffc882c558a300 /indra/llui/llnotifications.cpp | |
| parent | e414dfad51b3747fa20c0023820980f23f1cad2c (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge with 3.7.11-release
Diffstat (limited to 'indra/llui/llnotifications.cpp')
| -rwxr-xr-x | indra/llui/llnotifications.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index f4ad4a12db..7e235997d8 100755 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -1197,6 +1197,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)); } |