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