MAINT-1416 FIXED Close Mini-map floater after Ctrl-W if it's opened and other floaters are not in focus

changed fix to always close front most closable floater whether or not it has focus to
eliminate special case for mini map

1 files changed, 3 insertions, 8 deletions

diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 21a323941d..be78603e2d 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -476,8 +476,8 @@ class LLFileEnableCloseWindow : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		bool new_value = NULL != LLFloater::getClosableFloaterFromFocus();
-		return new_value || LLFloaterMap::getInstance()->isInVisibleChain();
+		bool new_value = NULL != gFloaterView->getFrontmostClosableFloater();
+		return new_value;
 	}
 };
 
@@ -485,12 +485,7 @@ class LLFileCloseWindow : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		bool new_value = (NULL == LLFloater::getClosableFloaterFromFocus());
-		if(new_value && LLFloaterMap::getInstance()->isInVisibleChain())
-		{
-			LLFloaterMap::getInstance()->closeFloater(false);
-		}
-		LLFloater::closeFocusedFloater();
+		LLFloater::closeFrontmostFloater();
 		return true;
 	}
 };