CHUI-258: Adding a method to better whether nearby chat is visible or not.

1 files changed, 29 insertions, 0 deletions

diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 4e53082c05..3bd5f96add 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -419,6 +419,35 @@ void LLNearbyChat::show()
 	setVisible(TRUE);
 }
 
+bool LLNearbyChat::isChatVisible() const
+{
+	bool isVisible = false;
+
+	if (isChatMultiTab())
+	{
+		LLIMFloaterContainer* im_box = LLIMFloaterContainer::getInstance();
+		// Is the IM floater container ever null?
+		llassert(im_box != NULL);
+		if (im_box != NULL)
+		{
+			if (gSavedSettings.getBOOL("NearbyChatIsNotTornOff"))
+			{
+				isVisible = (im_box->getVisible() && !im_box->isMinimized());
+			}
+			else
+			{
+				isVisible = (getVisible() && !isMinimized());
+			}
+		}
+	}
+	else
+	{
+		isVisible = (getVisible() && !isMinimized());
+	}
+
+	return isVisible;
+}
+
 void LLNearbyChat::showHistory()
 {
 	openFloater();