diff options
| author | callum <none@none> | 2009-12-15 17:53:03 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-15 17:53:03 -0800 |
| commit | b7747a815f1fb7ee49804b6b2daf2e347b27f7a5 (patch) | |
| tree | 7edef8c608cc99cb0e657694d259598294858851 /indra/newview/llchannelmanager.cpp | |
| parent | f923f896bca0d0d8459c35a5ef8e0d0171cbe664 (diff) | |
| parent | fc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (diff) | |
Merge with tip before push
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
| -rw-r--r-- | indra/newview/llchannelmanager.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index 415c118ff1..cbb566b3a7 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -228,3 +228,14 @@ void LLChannelManager::muteAllChannels(bool mute) } } +void LLChannelManager::killToastsFromChannel(const LLUUID& channel_id, const LLScreenChannel::Matcher& matcher) +{ + LLScreenChannel + * screen_channel = + dynamic_cast<LLScreenChannel*> (findChannelByID(channel_id)); + if (screen_channel != NULL) + { + screen_channel->killMatchedToasts(matcher); + } +} + |