diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-04-29 15:35:44 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-04-29 15:35:44 +0300 |
| commit | 8dae4c265e75e93ce3691ea1143e314f2fa84d93 (patch) | |
| tree | 41b21fab76b086523f5b149e6f4e7848e1650035 /indra/newview/llchannelmanager.cpp | |
| parent | 38086b7425137f85203700f61e04e04fc5bde04d (diff) | |
fixed EXT-6736 Notecard floater missing Keep/Discard Buttons (vwr 2.0)
Added functionality to close hidden IM toasts when IM floater opens.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/321/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
| -rw-r--r-- | indra/newview/llchannelmanager.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index 4f9434030f..fafa315a59 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -243,3 +243,19 @@ void LLChannelManager::killToastsFromChannel(const LLUUID& channel_id, const LLS } } +// static +LLNotificationsUI::LLScreenChannel* LLChannelManager::getNotificationScreenChannel() +{ + LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*> + (LLNotificationsUI::LLChannelManager::getInstance()-> + findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID")))); + + if (channel == NULL) + { + llwarns << "Can't find screen channel by NotificationChannelUUID" << llendl; + llassert(!"Can't find screen channel by NotificationChannelUUID"); + } + + return channel; +} + |