Skip to content
Snippets Groups Projects
Commit d45c1817 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix various annoying bugs in nearby chat chui

parent 90e0a663
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -295,7 +295,7 @@ void LLFloaterIMNearbyChat::setVisible(BOOL visible) ...@@ -295,7 +295,7 @@ void LLFloaterIMNearbyChat::setVisible(BOOL visible)
{ {
LLFloaterIMSessionTab::setVisible(visible); LLFloaterIMSessionTab::setVisible(visible);
if(visible) if(visible && isMessagePaneExpanded())
{ {
removeScreenChat(); removeScreenChat();
} }
...@@ -306,7 +306,7 @@ void LLFloaterIMNearbyChat::setVisibleAndFrontmost(BOOL take_focus, const LLSD& ...@@ -306,7 +306,7 @@ void LLFloaterIMNearbyChat::setVisibleAndFrontmost(BOOL take_focus, const LLSD&
{ {
LLFloaterIMSessionTab::setVisibleAndFrontmost(take_focus, key); LLFloaterIMSessionTab::setVisibleAndFrontmost(take_focus, key);
if(matchesKey(key)) if(!isTornOff() && matchesKey(key))
{ {
LLFloaterIMContainer::getInstance()->selectConversationPair(mSessionID, true, take_focus); LLFloaterIMContainer::getInstance()->selectConversationPair(mSessionID, true, take_focus);
} }
...@@ -632,6 +632,10 @@ void LLFloaterIMNearbyChat::sendChat( EChatType type ) ...@@ -632,6 +632,10 @@ void LLFloaterIMNearbyChat::sendChat( EChatType type )
if (gSavedSettings.getBOOL("CloseChatOnReturn")) if (gSavedSettings.getBOOL("CloseChatOnReturn"))
{ {
stopChat(); stopChat();
if (isTornOff())
{
closeHostedFloater();
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment