livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix normal EXT-2893 Nearby toast should hide after log became opened 

--HG--
branch : product-engine
meow-7.2.2
Yuri Chebotarev 2009-11-27 13:35:09 +02:00
parent 00fe55c9b6
commit 0a6570fe10
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llnearbychat.cpp
View File

@ -228,13 +228,23 @@ bool LLNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata)
return false;
}
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();
}
}
LLDockableFloater::setVisible(visible);
}
void LLNearbyChat::onOpen(const LLSD& key )
{
LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID")));
if(chat_channel)
{
chat_channel->removeToastsFromChannel();
}
LLDockableFloater::onOpen(key);
}
void LLNearbyChat::setRect (const LLRect &rect)

2
indra/newview/llnearbychat.h
View File

@ -53,6 +53,8 @@ public:
/*virtual*/ void onOpen (const LLSD& key);
/*virtual*/ void setVisible(BOOL visible);
virtual void setRect (const LLRect &rect);
private: