diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index b277998..768c925 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -601,9 +601,12 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
 		buffer = region->getHost().getString();
 		msg.append(buffer);
 #endif
-		// *TODO: put this under the control of XUI so it can be
-		// translated.
-		msg.append("\n(Double-click to open Map)");
+		// *TODO: 
+		//	- put this under the control of XUI so it can be translated.
+		//	- give user choice about behaviour
+		//
+		// old: msg.append("\n(Double-click to open Map)");
+		msg.append("\n(Double-click to teleport)");
 
 		S32 SLOP = 4;
 		localPointToScreen( 
@@ -764,7 +767,9 @@ void LLNetMap::createObjectImage()
 
 BOOL LLNetMap::handleDoubleClick( S32 x, S32 y, MASK mask )
 {
-	LLFloaterWorldMap::show(NULL, FALSE);
+	// TODO: give user choice about behaviour
+	// old: LLFloaterWorldMap::show(NULL, FALSE);
+	gAgent.teleportViaLocation( viewPosToGlobal(x,y) );
 	return TRUE;
 }