merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1351 https://svn.aws.productengine.com/secondlife/pe/stable-1@1365 -> viewer-2.0.0-3

EXT 451 EXT-303 EXT-367 EXT-367 EXT-371 EXT-394 EXT-494 EXT-502 EXT-503 EXT-516 EXT-538 EXT-540

1 files changed, 10 insertions, 18 deletions

diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index e3c4cd4895..9a66507eae 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -315,26 +315,18 @@ void LLNavigationBar::onLocationSelection()
 	}
 	else
 	{
-		region_name = extractLocalCoordsFromRegName(typed_location, &x, &y, &z);
-
-		if (region_name != typed_location) {
-			local_coords.set(x, y, z);
-		} 
+		LLInventoryModel::item_array_t landmark_items = LLLandmarkActions::fetchLandmarksByName(typed_location, FALSE);
+		if ( !landmark_items.empty() )
+		{
+			mUpdateTypedLocationHistory = true;
+			gAgent.teleportViaLandmark(landmark_items[0]->getAssetUUID());
+			return;
+		}
 		else
 		{
-			LLInventoryModel::item_array_t landmark_items = LLLandmarkActions::fetchLandmarksByName(typed_location);
-			LLViewerInventoryItem* item = NULL;
-			if ( !landmark_items.empty() )
-			{
-				item = landmark_items[0];
-			}
-
-			if (item)
-			{
-				mUpdateTypedLocationHistory = true;
-				gAgent.teleportViaLandmark(item->getAssetUUID());
-				return;
-			}
+			region_name = extractLocalCoordsFromRegName(typed_location, &x, &y, &z);
+			if (region_name != typed_location)
+				local_coords.set(x, y, z);
 		}
 		// Treat it as region name.
 		// region_name = typed_location;