Merged almost-final version of Imprudence 1.2 into 1.3

1 files changed, 27 insertions, 16 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 18c80eb..9087d9f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -3213,27 +3213,16 @@
       <key>Value</key>
       <integer>1</integer>
     </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>
@@ -4791,6 +4780,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>
@@ -8979,6 +8979,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowMiniMapRadar</key>
+    <map>
+      <key>Comment</key>
+      <string>Reveal the minimap radar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>ShowMovementControls</key>
     <map>
       <key>Comment</key>
@@ -10911,7 +10922,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1.0</real>
+      <real>1.002</real>
     </map>
     <key>UISndAlert</key>
     <map>