diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-30 16:01:36 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-30 16:01:36 -0700 |
| commit | 7eaae1fe819aef7dc8ac20387e62c3d13ab6d72f (patch) | |
| tree | 64448ec622eb8b4d4c40c1b43821bd8a9c5c4a08 /indra/newview/llchannelmanager.cpp | |
| parent | 07c207346f63d464e45efe0be3aae64138982279 (diff) | |
| parent | 10b073413548db34ec4c6c6f6976414cd97f9954 (diff) | |
Merge
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; +} + |