Skip to content
Snippets Groups Projects
Commit 0a6570fe authored by Yuri Chebotarev's avatar Yuri Chebotarev
Browse files

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

--HG--
branch : product-engine
parent 00fe55c9
Branches
Tags
No related merge requests found
...@@ -228,7 +228,9 @@ bool LLNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata) ...@@ -228,7 +228,9 @@ bool LLNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata)
return false; return false;
} }
void LLNearbyChat::onOpen(const LLSD& key ) void LLNearbyChat::setVisible(BOOL visible)
{
if(visible)
{ {
LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID"))); LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID")));
if(chat_channel) if(chat_channel)
...@@ -237,6 +239,14 @@ void LLNearbyChat::onOpen(const LLSD& key ) ...@@ -237,6 +239,14 @@ void LLNearbyChat::onOpen(const LLSD& key )
} }
} }
LLDockableFloater::setVisible(visible);
}
void LLNearbyChat::onOpen(const LLSD& key )
{
LLDockableFloater::onOpen(key);
}
void LLNearbyChat::setRect (const LLRect &rect) void LLNearbyChat::setRect (const LLRect &rect)
{ {
LLDockableFloater::setRect(rect); LLDockableFloater::setRect(rect);
......
...@@ -53,6 +53,8 @@ class LLNearbyChat: public LLDockableFloater ...@@ -53,6 +53,8 @@ class LLNearbyChat: public LLDockableFloater
/*virtual*/ void onOpen (const LLSD& key); /*virtual*/ void onOpen (const LLSD& key);
/*virtual*/ void setVisible(BOOL visible);
virtual void setRect (const LLRect &rect); virtual void setRect (const LLRect &rect);
private: private:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment