merge release@83343 skinning-1-merge@83714 -> release

QAR-424

1 files changed, 11 insertions, 14 deletions

diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index 7de980a075..d147f863ef 100644
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -184,23 +184,20 @@ BOOL LLFloaterMap::canClose()
 // virtual
 void LLFloaterMap::draw()
 {
-	if( getVisible() )
+	// Note: we can't just gAgent.check cameraMouselook() because the transition states are wrong.
+	if( gAgent.cameraMouselook())
 	{
-		// Note: we can't just gAgent.check cameraMouselook() because the transition states are wrong.
-		if( gAgent.cameraMouselook())
-		{
-			setMouseOpaque(FALSE);
-			getDragHandle()->setMouseOpaque(FALSE);
+		setMouseOpaque(FALSE);
+		getDragHandle()->setMouseOpaque(FALSE);
 
-			drawChild(mMap);
-		}
-		else
-		{
-			setMouseOpaque(TRUE);
-			getDragHandle()->setMouseOpaque(TRUE);
+		drawChild(mMap);
+	}
+	else
+	{
+		setMouseOpaque(TRUE);
+		getDragHandle()->setMouseOpaque(TRUE);
 
-			LLFloater::draw();
-		}
+		LLFloater::draw();
 	}
 }