Added "DoubleClickAction" and "GoAction" settings.

Together they replace "DoubleClickAutopilot" and
"DoubleClickTeleport".

1 files changed, 15 insertions, 15 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e1a6f1f..95dd186 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2399,27 +2399,16 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
-    <key>DoubleClickAutoPilot</key>
+    <key>DoubleClickAction</key>
     <map>
       <key>Comment</key>
-      <string>Enable double-click auto pilot</string>
+      <string>What to do when you double-click. Either "None" or "Go".</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>DoubleClickTeleport</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable double-click teleport</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
+      <string>String</string>
       <key>Value</key>
-      <integer>1</integer>
+      <string>None</string>
     </map>
     <key>DragAndDropToolTipDelay</key>
     <map>
@@ -3913,6 +3902,17 @@
       <key>Value</key>
       <integer>1024</integer>
     </map>
+    <key>GoAction</key>
+    <map>
+      <key>Comment</key>
+      <string>How to move for "Go Here" or double-click move. Either "Autopilot" or "Teleport".</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Autopilot</string>
+    </map>
     <key>GridCrossSections</key>
     <map>
       <key>Comment</key>