Probs fix nearby chat

indra/newview/llfloaterimnearbychat.cpp

@@ -208,6 +208,35 @@ void LLFloaterIMNearbyChat::closeHostedFloater()
 	}
 }
 
+void LLFloaterIMNearbyChat::closeFloater(bool app_quitting)
+{
+	LLFloaterEmojiPicker::saveState();
+
+	// If detached from conversations window close anyway
+	if (!getHost())
+	{
+		LLFloaterIMSessionTab::closeFloater(app_quitting);
+	}
+
+	// Should check how many conversations are ongoing. Select next to "Nearby Chat" in case there are some other besides.
+	// Close conversations window in case "Nearby Chat" is attached and the only conversation
+	LLFloaterIMContainer* floater_container = LLFloaterIMContainer::getInstance();
+	if (floater_container->getConversationListItemSize() == 1)
+	{
+		if (getHost())
+		{
+			floater_container->closeFloater(app_quitting);
+		}
+	}
+	else
+	{
+		if (!getHost())
+		{
+			floater_container->selectNextConversationByID(LLUUID());
+		}
+	}
+}
+
 // virtual
 void LLFloaterIMNearbyChat::refresh()
 {

indra/newview/llfloaterimnearbychat.h

@@ -65,6 +65,8 @@ class LLFloaterIMNearbyChat final
 	/*virtual*/ void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD()) override;
 	/*virtual*/ void closeHostedFloater() override;
 
+	void	closeFloater(bool app_quitting = false) override;
+
 	void loadHistory();
     void reloadMessages(bool clean_messages = false);
 	void removeScreenChat();