From fd56f291010044bbe01f25cfdad8c43b3dbd8ccc Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 2 Nov 2009 22:55:58 -0600
Subject: Added "Double-Click Action" and "Go Here By" to Input prefs panel.
---
linden/indra/newview/llpanelinput.cpp | 7 ++++
.../default/xui/en-us/panel_preferences_input.xml | 37 ++++++++++++++++++++++
2 files changed, 44 insertions(+)
(limited to 'linden/indra')
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 @@
+
+
+
+ Double-Click Action:
+
+
+
+
+ None
+
+
+ Go Here
+
+
+
+
+
+ “Go Here” By:
+
+
+
+
+ Autopilot
+
+
+ Teleporting
+
+
+
--
cgit v1.1