diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
| commit | a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch) | |
| tree | 051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/newview/app_settings | |
| parent | 62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff) | |
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/keys.ini | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/app_settings/keys.ini b/indra/newview/app_settings/keys.ini index 3a1e9ead36..b79e5bf508 100644 --- a/indra/newview/app_settings/keys.ini +++ b/indra/newview/app_settings/keys.ini @@ -40,6 +40,7 @@ FIRST_PERSON PAD_PGDN NONE push_down FIRST_PERSON PAD_HOME NONE toggle_fly FIRST_PERSON PAD_CENTER NONE stop_moving FIRST_PERSON PAD_ENTER NONE start_chat +FIRST_PERSON PAD_DIVIDE NONE start_gesture FIRST_PERSON A SHIFT slide_left FIRST_PERSON D SHIFT slide_right @@ -51,6 +52,7 @@ FIRST_PERSON F SHIFT toggle_fly FIRST_PERSON SPACE NONE stop_moving FIRST_PERSON ENTER NONE start_chat +FIRST_PERSON DIVIDE NONE start_gesture FIRST_PERSON LEFT SHIFT slide_left FIRST_PERSON RIGHT SHIFT slide_right @@ -67,6 +69,7 @@ FIRST_PERSON PAD_PGUP SHIFT jump FIRST_PERSON PAD_PGDN SHIFT push_down FIRST_PERSON PAD_HOME SHIFT toggle_fly FIRST_PERSON PAD_ENTER SHIFT start_chat +FIRST_PERSON PAD_DIVIDE SHIFT start_gesture THIRD_PERSON A NONE turn_left THIRD_PERSON D NONE turn_right @@ -86,6 +89,7 @@ THIRD_PERSON F SHIFT toggle_fly THIRD_PERSON SPACE NONE stop_moving THIRD_PERSON ENTER NONE start_chat +THIRD_PERSON DIVIDE NONE start_gesture THIRD_PERSON LEFT NONE turn_left THIRD_PERSON LEFT SHIFT slide_left @@ -120,6 +124,8 @@ THIRD_PERSON PAD_CENTER NONE stop_moving THIRD_PERSON PAD_CENTER SHIFT stop_moving THIRD_PERSON PAD_ENTER NONE start_chat THIRD_PERSON PAD_ENTER SHIFT start_chat +THIRD_PERSON PAD_DIVIDE NONE start_gesture +THIRD_PERSON PAD_DIVIDE SHIFT start_gesture # Camera controls in third person on Alt THIRD_PERSON LEFT ALT spin_around_cw @@ -143,6 +149,7 @@ THIRD_PERSON PAD_DOWN ALT move_backward THIRD_PERSON PAD_PGUP ALT spin_over THIRD_PERSON PAD_PGDN ALT spin_under THIRD_PERSON PAD_ENTER ALT start_chat +THIRD_PERSON PAD_DIVIDE ALT start_gesture # mimic alt zoom behavior with keyboard only THIRD_PERSON A CTL_ALT spin_around_cw @@ -166,6 +173,7 @@ THIRD_PERSON PAD_DOWN CTL_ALT spin_under THIRD_PERSON PAD_PGUP CTL_ALT spin_over THIRD_PERSON PAD_PGDN CTL_ALT spin_under THIRD_PERSON PAD_ENTER CTL_ALT start_chat +THIRD_PERSON PAD_DIVIDE CTL_ALT start_gesture # Therefore pan on Alt-Shift THIRD_PERSON A CTL_ALT_SHIFT pan_left @@ -183,6 +191,7 @@ THIRD_PERSON PAD_RIGHT CTL_ALT_SHIFT pan_right THIRD_PERSON PAD_UP CTL_ALT_SHIFT pan_up THIRD_PERSON PAD_DOWN CTL_ALT_SHIFT pan_down THIRD_PERSON PAD_ENTER CTL_ALT_SHIFT start_chat +THIRD_PERSON PAD_DIVIDE CTL_ALT_SHIFT start_gesture # Basic editing camera control EDIT A NONE spin_around_cw @@ -192,7 +201,9 @@ EDIT S NONE move_backward EDIT E NONE spin_over EDIT C NONE spin_under EDIT ENTER NONE start_chat +EDIT DIVIDE NONE start_gesture EDIT PAD_ENTER NONE start_chat +EDIT PAD_DIVIDE NONE start_gesture EDIT LEFT NONE spin_around_cw EDIT RIGHT NONE spin_around_ccw @@ -234,6 +245,7 @@ EDIT PAD_DOWN ALT push_backward EDIT PAD_PGUP ALT jump EDIT PAD_PGDN ALT push_down EDIT PAD_ENTER ALT start_chat +EDIT PAD_DIVIDE ALT start_gesture SITTING A ALT spin_around_cw SITTING D ALT spin_around_ccw @@ -286,6 +298,7 @@ SITTING PAD_PGUP NONE spin_over_sitting SITTING PAD_PGDN NONE spin_under_sitting SITTING PAD_CENTER NONE stop_moving SITTING PAD_ENTER NONE start_chat +SITTING PAD_DIVIDE NONE start_gesture # these are for passing controls when sitting on vehicles SITTING A SHIFT slide_left @@ -296,6 +309,7 @@ SITTING RIGHT SHIFT slide_right SITTING PAD_LEFT SHIFT slide_left SITTING PAD_RIGHT SHIFT slide_right SITTING PAD_ENTER SHIFT start_chat +SITTING PAD_DIVIDE SHIFT start_gesture # pan on Alt-Shift SITTING A CTL_ALT_SHIFT pan_left @@ -313,8 +327,10 @@ SITTING PAD_RIGHT CTL_ALT_SHIFT pan_right SITTING PAD_UP CTL_ALT_SHIFT pan_up SITTING PAD_DOWN CTL_ALT_SHIFT pan_down SITTING PAD_ENTER CTL_ALT_SHIFT start_chat +SITTING PAD_DIVIDE CTL_ALT_SHIFT start_gesture SITTING ENTER NONE start_chat +SITTING DIVIDE NONE start_gesture # Avatar editing camera controls EDIT_AVATAR A NONE edit_avatar_spin_cw @@ -330,6 +346,7 @@ EDIT_AVATAR DOWN NONE edit_avatar_move_backward EDIT_AVATAR PGUP NONE edit_avatar_spin_over EDIT_AVATAR PGDN NONE edit_avatar_spin_under EDIT_AVATAR ENTER NONE start_chat +EDIT_AVATAR DIVIDE NONE start_gesture EDIT_AVATAR PAD_LEFT NONE edit_avatar_spin_cw EDIT_AVATAR PAD_RIGHT NONE edit_avatar_spin_ccw EDIT_AVATAR PAD_UP NONE edit_avatar_move_forward @@ -337,3 +354,4 @@ EDIT_AVATAR PAD_DOWN NONE edit_avatar_move_backward EDIT_AVATAR PAD_PGUP NONE edit_avatar_spin_over EDIT_AVATAR PAD_PGDN NONE edit_avatar_spin_under EDIT_AVATAR PAD_ENTER NONE start_chat +EDIT_AVATAR PAD_DIVIDE NONE start_gesture |