aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/app_settings/keys.ini
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/app_settings/keys.ini')
-rw-r--r--linden/indra/newview/app_settings/keys.ini18
1 files changed, 18 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/keys.ini b/linden/indra/newview/app_settings/keys.ini
index 3a1e9ea..b79e5bf 100644
--- a/linden/indra/newview/app_settings/keys.ini
+++ b/linden/indra/newview/app_settings/keys.ini
@@ -40,6 +40,7 @@ FIRST_PERSON PAD_PGDN NONE push_down
40FIRST_PERSON PAD_HOME NONE toggle_fly 40FIRST_PERSON PAD_HOME NONE toggle_fly
41FIRST_PERSON PAD_CENTER NONE stop_moving 41FIRST_PERSON PAD_CENTER NONE stop_moving
42FIRST_PERSON PAD_ENTER NONE start_chat 42FIRST_PERSON PAD_ENTER NONE start_chat
43FIRST_PERSON PAD_DIVIDE NONE start_gesture
43 44
44FIRST_PERSON A SHIFT slide_left 45FIRST_PERSON A SHIFT slide_left
45FIRST_PERSON D SHIFT slide_right 46FIRST_PERSON D SHIFT slide_right
@@ -51,6 +52,7 @@ FIRST_PERSON F SHIFT toggle_fly
51 52
52FIRST_PERSON SPACE NONE stop_moving 53FIRST_PERSON SPACE NONE stop_moving
53FIRST_PERSON ENTER NONE start_chat 54FIRST_PERSON ENTER NONE start_chat
55FIRST_PERSON DIVIDE NONE start_gesture
54 56
55FIRST_PERSON LEFT SHIFT slide_left 57FIRST_PERSON LEFT SHIFT slide_left
56FIRST_PERSON RIGHT SHIFT slide_right 58FIRST_PERSON RIGHT SHIFT slide_right
@@ -67,6 +69,7 @@ FIRST_PERSON PAD_PGUP SHIFT jump
67FIRST_PERSON PAD_PGDN SHIFT push_down 69FIRST_PERSON PAD_PGDN SHIFT push_down
68FIRST_PERSON PAD_HOME SHIFT toggle_fly 70FIRST_PERSON PAD_HOME SHIFT toggle_fly
69FIRST_PERSON PAD_ENTER SHIFT start_chat 71FIRST_PERSON PAD_ENTER SHIFT start_chat
72FIRST_PERSON PAD_DIVIDE SHIFT start_gesture
70 73
71THIRD_PERSON A NONE turn_left 74THIRD_PERSON A NONE turn_left
72THIRD_PERSON D NONE turn_right 75THIRD_PERSON D NONE turn_right
@@ -86,6 +89,7 @@ THIRD_PERSON F SHIFT toggle_fly
86 89
87THIRD_PERSON SPACE NONE stop_moving 90THIRD_PERSON SPACE NONE stop_moving
88THIRD_PERSON ENTER NONE start_chat 91THIRD_PERSON ENTER NONE start_chat
92THIRD_PERSON DIVIDE NONE start_gesture
89 93
90THIRD_PERSON LEFT NONE turn_left 94THIRD_PERSON LEFT NONE turn_left
91THIRD_PERSON LEFT SHIFT slide_left 95THIRD_PERSON LEFT SHIFT slide_left
@@ -120,6 +124,8 @@ THIRD_PERSON PAD_CENTER NONE stop_moving
120THIRD_PERSON PAD_CENTER SHIFT stop_moving 124THIRD_PERSON PAD_CENTER SHIFT stop_moving
121THIRD_PERSON PAD_ENTER NONE start_chat 125THIRD_PERSON PAD_ENTER NONE start_chat
122THIRD_PERSON PAD_ENTER SHIFT start_chat 126THIRD_PERSON PAD_ENTER SHIFT start_chat
127THIRD_PERSON PAD_DIVIDE NONE start_gesture
128THIRD_PERSON PAD_DIVIDE SHIFT start_gesture
123 129
124# Camera controls in third person on Alt 130# Camera controls in third person on Alt
125THIRD_PERSON LEFT ALT spin_around_cw 131THIRD_PERSON LEFT ALT spin_around_cw
@@ -143,6 +149,7 @@ THIRD_PERSON PAD_DOWN ALT move_backward
143THIRD_PERSON PAD_PGUP ALT spin_over 149THIRD_PERSON PAD_PGUP ALT spin_over
144THIRD_PERSON PAD_PGDN ALT spin_under 150THIRD_PERSON PAD_PGDN ALT spin_under
145THIRD_PERSON PAD_ENTER ALT start_chat 151THIRD_PERSON PAD_ENTER ALT start_chat
152THIRD_PERSON PAD_DIVIDE ALT start_gesture
146 153
147# mimic alt zoom behavior with keyboard only 154# mimic alt zoom behavior with keyboard only
148THIRD_PERSON A CTL_ALT spin_around_cw 155THIRD_PERSON A CTL_ALT spin_around_cw
@@ -166,6 +173,7 @@ THIRD_PERSON PAD_DOWN CTL_ALT spin_under
166THIRD_PERSON PAD_PGUP CTL_ALT spin_over 173THIRD_PERSON PAD_PGUP CTL_ALT spin_over
167THIRD_PERSON PAD_PGDN CTL_ALT spin_under 174THIRD_PERSON PAD_PGDN CTL_ALT spin_under
168THIRD_PERSON PAD_ENTER CTL_ALT start_chat 175THIRD_PERSON PAD_ENTER CTL_ALT start_chat
176THIRD_PERSON PAD_DIVIDE CTL_ALT start_gesture
169 177
170# Therefore pan on Alt-Shift 178# Therefore pan on Alt-Shift
171THIRD_PERSON A CTL_ALT_SHIFT pan_left 179THIRD_PERSON A CTL_ALT_SHIFT pan_left
@@ -183,6 +191,7 @@ THIRD_PERSON PAD_RIGHT CTL_ALT_SHIFT pan_right
183THIRD_PERSON PAD_UP CTL_ALT_SHIFT pan_up 191THIRD_PERSON PAD_UP CTL_ALT_SHIFT pan_up
184THIRD_PERSON PAD_DOWN CTL_ALT_SHIFT pan_down 192THIRD_PERSON PAD_DOWN CTL_ALT_SHIFT pan_down
185THIRD_PERSON PAD_ENTER CTL_ALT_SHIFT start_chat 193THIRD_PERSON PAD_ENTER CTL_ALT_SHIFT start_chat
194THIRD_PERSON PAD_DIVIDE CTL_ALT_SHIFT start_gesture
186 195
187# Basic editing camera control 196# Basic editing camera control
188EDIT A NONE spin_around_cw 197EDIT A NONE spin_around_cw
@@ -192,7 +201,9 @@ EDIT S NONE move_backward
192EDIT E NONE spin_over 201EDIT E NONE spin_over
193EDIT C NONE spin_under 202EDIT C NONE spin_under
194EDIT ENTER NONE start_chat 203EDIT ENTER NONE start_chat
204EDIT DIVIDE NONE start_gesture
195EDIT PAD_ENTER NONE start_chat 205EDIT PAD_ENTER NONE start_chat
206EDIT PAD_DIVIDE NONE start_gesture
196 207
197EDIT LEFT NONE spin_around_cw 208EDIT LEFT NONE spin_around_cw
198EDIT RIGHT NONE spin_around_ccw 209EDIT RIGHT NONE spin_around_ccw
@@ -234,6 +245,7 @@ EDIT PAD_DOWN ALT push_backward
234EDIT PAD_PGUP ALT jump 245EDIT PAD_PGUP ALT jump
235EDIT PAD_PGDN ALT push_down 246EDIT PAD_PGDN ALT push_down
236EDIT PAD_ENTER ALT start_chat 247EDIT PAD_ENTER ALT start_chat
248EDIT PAD_DIVIDE ALT start_gesture
237 249
238SITTING A ALT spin_around_cw 250SITTING A ALT spin_around_cw
239SITTING D ALT spin_around_ccw 251SITTING D ALT spin_around_ccw
@@ -286,6 +298,7 @@ SITTING PAD_PGUP NONE spin_over_sitting
286SITTING PAD_PGDN NONE spin_under_sitting 298SITTING PAD_PGDN NONE spin_under_sitting
287SITTING PAD_CENTER NONE stop_moving 299SITTING PAD_CENTER NONE stop_moving
288SITTING PAD_ENTER NONE start_chat 300SITTING PAD_ENTER NONE start_chat
301SITTING PAD_DIVIDE NONE start_gesture
289 302
290# these are for passing controls when sitting on vehicles 303# these are for passing controls when sitting on vehicles
291SITTING A SHIFT slide_left 304SITTING A SHIFT slide_left
@@ -296,6 +309,7 @@ SITTING RIGHT SHIFT slide_right
296SITTING PAD_LEFT SHIFT slide_left 309SITTING PAD_LEFT SHIFT slide_left
297SITTING PAD_RIGHT SHIFT slide_right 310SITTING PAD_RIGHT SHIFT slide_right
298SITTING PAD_ENTER SHIFT start_chat 311SITTING PAD_ENTER SHIFT start_chat
312SITTING PAD_DIVIDE SHIFT start_gesture
299 313
300# pan on Alt-Shift 314# pan on Alt-Shift
301SITTING A CTL_ALT_SHIFT pan_left 315SITTING A CTL_ALT_SHIFT pan_left
@@ -313,8 +327,10 @@ SITTING PAD_RIGHT CTL_ALT_SHIFT pan_right
313SITTING PAD_UP CTL_ALT_SHIFT pan_up 327SITTING PAD_UP CTL_ALT_SHIFT pan_up
314SITTING PAD_DOWN CTL_ALT_SHIFT pan_down 328SITTING PAD_DOWN CTL_ALT_SHIFT pan_down
315SITTING PAD_ENTER CTL_ALT_SHIFT start_chat 329SITTING PAD_ENTER CTL_ALT_SHIFT start_chat
330SITTING PAD_DIVIDE CTL_ALT_SHIFT start_gesture
316 331
317SITTING ENTER NONE start_chat 332SITTING ENTER NONE start_chat
333SITTING DIVIDE NONE start_gesture
318 334
319# Avatar editing camera controls 335# Avatar editing camera controls
320EDIT_AVATAR A NONE edit_avatar_spin_cw 336EDIT_AVATAR A NONE edit_avatar_spin_cw
@@ -330,6 +346,7 @@ EDIT_AVATAR DOWN NONE edit_avatar_move_backward
330EDIT_AVATAR PGUP NONE edit_avatar_spin_over 346EDIT_AVATAR PGUP NONE edit_avatar_spin_over
331EDIT_AVATAR PGDN NONE edit_avatar_spin_under 347EDIT_AVATAR PGDN NONE edit_avatar_spin_under
332EDIT_AVATAR ENTER NONE start_chat 348EDIT_AVATAR ENTER NONE start_chat
349EDIT_AVATAR DIVIDE NONE start_gesture
333EDIT_AVATAR PAD_LEFT NONE edit_avatar_spin_cw 350EDIT_AVATAR PAD_LEFT NONE edit_avatar_spin_cw
334EDIT_AVATAR PAD_RIGHT NONE edit_avatar_spin_ccw 351EDIT_AVATAR PAD_RIGHT NONE edit_avatar_spin_ccw
335EDIT_AVATAR PAD_UP NONE edit_avatar_move_forward 352EDIT_AVATAR PAD_UP NONE edit_avatar_move_forward
@@ -337,3 +354,4 @@ EDIT_AVATAR PAD_DOWN NONE edit_avatar_move_backward
337EDIT_AVATAR PAD_PGUP NONE edit_avatar_spin_over 354EDIT_AVATAR PAD_PGUP NONE edit_avatar_spin_over
338EDIT_AVATAR PAD_PGDN NONE edit_avatar_spin_under 355EDIT_AVATAR PAD_PGDN NONE edit_avatar_spin_under
339EDIT_AVATAR PAD_ENTER NONE start_chat 356EDIT_AVATAR PAD_ENTER NONE start_chat
357EDIT_AVATAR PAD_DIVIDE NONE start_gesture