diff options
| author | Andrew Productengine <adyukov@productengine.com> | 2010-11-18 13:14:06 +0200 |
|---|---|---|
| committer | Andrew Productengine <adyukov@productengine.com> | 2010-11-18 13:14:06 +0200 |
| commit | 86260988e332c2ff750f680ada13560c2c97fa5d (patch) | |
| tree | 34f824a6e2d12cf99826fcde169684a6a093989d /indra/newview/skins/default | |
| parent | d76e0dd87f64258ade944323eb5cb6063bca7444 (diff) | |
STORM-576 FIXED Hooked up code to preference that allows users to enable double-click to teleport or use auto-pilot.
- Added dirty flag that is set true when user changes checkbox or chooses one of radiobuttons connected to double-click action. No change of user settings happens on this commit, because user may press cancel or close floater. If user presses OK, and flag is true, user changes are applied to settings.
If user clicks cancel or closes floater, controls are reverted to the state they were before changes, using settings to determine it.
- Removed double-click action menu items and code that handled them to avoid functionality duplication and synchronization problems.
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 20 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_move.xml | 9 |
2 files changed, 6 insertions, 23 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 9fcf952bf0..f74b6ba7b5 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2661,26 +2661,6 @@ function="Advanced.PrintTextureMemoryStats" /> </menu_item_call> <menu_item_check - label="Double-ClickAuto-Pilot" - name="Double-ClickAuto-Pilot"> - <menu_item_check.on_check - function="CheckControl" - parameter="DoubleClickAutoPilot" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="DoubleClickAutoPilot" /> - </menu_item_check> - <menu_item_check - label="Double-Click Teleport" - name="DoubleClick Teleport"> - <menu_item_check.on_check - function="CheckControl" - parameter="DoubleClickTeleport" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="DoubleClickTeleport" /> - </menu_item_check> - <menu_item_check label="Region Debug Console" name="Region Debug Console" shortcut="control|shift|`" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index c893a92e7c..d2fc6ea09a 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -177,7 +177,10 @@ left_delta="0" name="double_click_chkbox" width="237" - top_pad="0"/> + top_pad="0"> + <check_box.commit_callback + function="Pref.CommitDoubleClickChekbox"/> + </check_box> <radio_group height="20" layout="topleft" @@ -191,7 +194,6 @@ left="0" name="radio_teleport" top_delta="20" - value="0" width="100" /> <radio_item height="16" @@ -200,8 +202,9 @@ layout="topleft" name="radio_autopilot" top_delta="0" - value="1" width="75" /> + <radio_group.commit_callback + function="Pref.CommitRadioDoubleClick"/> </radio_group> <button height="23" |