From 08db042da2c4a6897d6fabb86a4171f0e6ef4ed2 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 25 Nov 2015 16:53:25 +0100
Subject: [PATCH] Also enable the map button on the region tracker if no region
 is selected for less annoyance

---
 indra/newview/alfloaterregiontracker.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/indra/newview/alfloaterregiontracker.cpp b/indra/newview/alfloaterregiontracker.cpp
index 1b88a4109e..ecad46f384 100644
--- a/indra/newview/alfloaterregiontracker.cpp
+++ b/indra/newview/alfloaterregiontracker.cpp
@@ -104,7 +104,7 @@ void ALFloaterRegionTracker::updateHeader()
 	S32 num_selected(mRegionScrollList->getNumSelected());
 	mRefreshRegionListBtn->setEnabled(mRegionMap.size() != 0);
 	mRemoveRegionBtn->setEnabled(!!num_selected);
-	mOpenMapBtn->setEnabled(num_selected == 1);
+	mOpenMapBtn->setEnabled(num_selected <= 1);
 }
 
 void ALFloaterRegionTracker::refresh()
@@ -291,11 +291,18 @@ void ALFloaterRegionTracker::onRegionAddedCallback(const LLSD& notification, con
 
 void ALFloaterRegionTracker::openMap()
 {
-	const std::string& region = mRegionScrollList->getFirstSelected()->getValue().asString();
-	LLFloaterWorldMap* worldmap_floaterp = LLFloaterWorldMap::getInstance();
-	if (!region.empty() && worldmap_floaterp)
+	if (mRegionScrollList->getNumSelected() == 0)
 	{
-		worldmap_floaterp->trackURL(region, 128, 128, 0);
 		LLFloaterReg::showInstance("world_map", "center");
 	}
+	else
+	{
+		const std::string& region = mRegionScrollList->getFirstSelected()->getValue().asString();
+		LLFloaterWorldMap* worldmap_floaterp = LLFloaterWorldMap::getInstance();
+		if (!region.empty() && worldmap_floaterp)
+		{
+			worldmap_floaterp->trackURL(region, 128, 128, 0);
+			LLFloaterReg::showInstance("world_map", "center");
+		}
+	}
 }