2 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4c9a14c..f529acd 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -12,6 +12,12 @@
                 modified:   linden/indra/newview/llnetmap.cpp
                 modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
                 modified:   linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
+                
+                
+                * Removed double click tp checkbox from preferences as it keeps the two maps more in sync,
+                  and Show Map is in the minimap now. Keeping the debug setting.
+                
+                modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
 
 
 2009-06-12  McCabe Maxsted  <hakushakukun@gmail.com>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 6c8ffdb..ea04dfc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -77,10 +77,6 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Rotate Mini-Map" left="151" mouse_opaque="true"
              name="rotate_mini_map_checkbox" radio_style="false" width="256" />
-        <check_box bottom="-286" control_name="MiniMapTeleport" enabled="true" follows="left|top"
-                   font="SansSerifSmall" height="16" initial_value="false"
-                   label="Doubleclick Mini-Map Teleports" left="280" mouse_opaque="true"
-                   name="teleport_mini_map_checkbox" radio_style="false" width="256" />
         <check_box bottom="-304" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Notify when Linden dollars (L$) spent or received" left="151"