Added "Double-Click Action" and "Go Here By" to Input prefs panel.

2 files changed, 44 insertions, 0 deletions

diff --git a/linden/indra/newview/llpanelinput.cpp b/linden/indra/newview/llpanelinput.cpp
index 7ab261b..6d40470 100644
--- a/linden/indra/newview/llpanelinput.cpp
+++ b/linden/indra/newview/llpanelinput.cpp
@@ -55,6 +55,9 @@ BOOL LLPanelInput::postBuild()
         childSetValue("camera_position_smoothing", gSavedSettings.getF32("CameraPositionSmoothing"));
         childSetValue("first_person_avatar_visible", gSavedSettings.getBOOL("FirstPersonAvatarVisible"));
 
+        childSetValue("double_click_action", gSavedSettings.getString("DoubleClickAction"));
+        childSetValue("go_action", gSavedSettings.getString("GoAction"));
+
         return TRUE;
 }
 
@@ -74,6 +77,10 @@ void LLPanelInput::apply()
         gSavedSettings.setF32("ZoomTime", childGetValue("zoom_time").asReal());
         gSavedSettings.setF32("CameraPositionSmoothing", childGetValue("camera_position_smoothing").asReal());
         gSavedSettings.setBOOL("FirstPersonAvatarVisible", childGetValue("first_person_avatar_visible"));
+
+        gSavedSettings.setString("DoubleClickAction", childGetValue("double_click_action"));
+        gSavedSettings.setString("GoAction", childGetValue("go_action"));
+
 }
 
 void LLPanelInput::cancel()
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index a0f1744..88d87e1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -103,4 +103,41 @@
         <button bottom_delta="-4" follows="left|top" font="SansSerif" height="20"
              label="Joystick Setup" left="148" mouse_opaque="true"
              name="joystick_setup_button" width="155" />
+
+
+        <text name="double_click_action_label"
+              bottom_delta="-32" left="10" height="18" width="200"
+        follows="left|top" font="SansSerifSmall" mouse_opaque="true">
+    Double-Click Action:
+        </text>
+
+  <combo_box name="double_click_action"
+             bottom_delta="0" left_delta="138" height="18" width="150"
+             follows="left|top" mouse_opaque="true">
+                <combo_item name="None" value="None">
+                        None
+                </combo_item>
+                <combo_item name="Go" value="Go">
+                        Go Here
+                </combo_item>
+  </combo_box>
+
+
+        <text name="go_action_label"
+              bottom_delta="-20" left="10" height="18" width="200"
+        follows="left|top" font="SansSerifSmall" mouse_opaque="true">
+    “Go Here” By:
+        </text>
+
+  <combo_box name="go_action"
+             bottom_delta="0" left_delta="138" height="18" width="150"
+             follows="left|top" mouse_opaque="true">
+                <combo_item name="Autopilot" value="Autopilot">
+                        Autopilot
+                </combo_item>
+                <combo_item name="Teleport" value="Teleport">
+                        Teleporting
+                </combo_item>
+  </combo_box>
+
 </panel>