diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a26599da5b..2d66b5295c 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -17069,6 +17069,17 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>FSWorldMapDoubleclickTeleport</key>
+  <map>
+    <key>Comment</key>
+    <string>If enabled, double click teleports on the world map will be enabled (default).</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
 
 </map>
 </llsd>
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index aa975e086b..bb0606ed9c 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -1851,7 +1851,9 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
 					// Teleport if we got a valid location
 					LLVector3d pos_global = viewPosToGlobal(x,y);
 					LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromPosGlobal(pos_global);
-					if (sim_info && !sim_info->isDown())
+					// <FS:Ansariel> Doubleclick teleport option for worldmap
+					//if (sim_info && !sim_info->isDown())
+					if (sim_info && !sim_info->isDown() && gSavedSettings.getBOOL("FSWorldMapDoubleclickTeleport"))
 					{
 						gAgent.teleportViaLocation( pos_global );
 					}
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
index 3e46c36537..f033fcfafd 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
@@ -9,6 +9,7 @@
 		<text name="textMiscRLVaRestart">
 			(Erfordert Neustart)
 		</text>
+		<check_box label="Aktiviere Teleport via Doppelklick auf der Weltkarte" name="FSWorldMapDoubleclickTeleport" tool_tip="Aktiviert das Teleportieren zu einem Ziel auf der Weltkarte mittels Doppelklick."/>
 		<check_box label="Deaktiviere Teleport-Anzeige" name="tp_screen_toggle" tool_tip="Deaktiviert den schwarzen Teleport-Bildschirm während eines Teleports."/>
 		<check_box label="Deaktiviere Teleport-Leitstrahl" name="tp_beam_toggle" tool_tip="Deaktiviert den Leitstrahl zum Teleportziel nach Teleports."/>
 		<check_box label="Deaktiviere Fortschrittsanzeige während des Logins" name="login_screen_toggle" tool_tip="Deaktiviert die schwarze Fortschrittsanzeige während des Logins."/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index 135b1004c7..da82462255 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -57,6 +57,16 @@
             (requires restart)
         </text>
         
+        <check_box
+         top_pad="5"
+         follows="left|top"
+         height="16"
+         label="Enable double click teleports on the world map"
+         left="15"
+         name="FSWorldMapDoubleclickTeleport"
+         width="270"
+         control_name="FSWorldMapDoubleclickTeleport"
+         tool_tip="Enables teleporting via double click to a destination on the world map."/>
         <check_box
          top_pad="5"
          follows="left|top"