diff options
| author | Richard Linden <none@none> | 2011-11-02 10:35:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-02 10:35:09 -0700 |
| commit | 2c3fc19aac83b92651cc058126aff0ba66d1ad3c (patch) | |
| tree | a829e2086442b09baa84fa6ae74c30595844b1a9 /indra/newview/llnearbychat.cpp | |
| parent | 148e5f436dbb6f9126f1f6235e9056d4fb14ca66 (diff) | |
| parent | 5e1bb6fbaaba4b1fbcb2b25a3fe9b9d9148e806a (diff) | |
Automated merge with bundle:c:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.ybhs9f\ssh__richard@hg.lindenlab.com_callum_viewer-experience-llqtwebkit_w9twsb.hg
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 3418462192..a7303ad035 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -60,13 +60,9 @@ static const S32 RESIZE_BAR_THICKNESS = 3; static LLRegisterPanelClassWrapper<LLNearbyChat> t_panel_nearby_chat("panel_nearby_chat"); -LLNearbyChat::LLNearbyChat() - : LLPanel() - ,mChatHistory(NULL) -{ -} - -LLNearbyChat::~LLNearbyChat() +LLNearbyChat::LLNearbyChat(const LLNearbyChat::Params& p) +: LLPanel(p), + mChatHistory(NULL) { } @@ -178,15 +174,20 @@ bool LLNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata) return false; } +void LLNearbyChat::removeScreenChat() +{ + LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID"))); + if(chat_channel) + { + chat_channel->removeToastsFromChannel(); + } +} + void LLNearbyChat::setVisible(BOOL visible) { if(visible) { - LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID"))); - if(chat_channel) - { - chat_channel->removeToastsFromChannel(); - } + removeScreenChat(); } LLPanel::setVisible(visible); |