diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-04-18 22:19:14 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-04-18 22:19:14 +0000 |
| commit | 030d61ac58be38f9f8aafeb68b383d88d670080b (patch) | |
| tree | 79af0678906bf9e05316614d52b4cf5e97d1adc2 /indra/newview/app_settings | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
| parent | d031662435d97101411ae990ed85d6e001ab668a (diff) | |
Merged in D559-merge-6.5.5 (pull request #946)
DRTVWR-559 merge up to 6.5.5
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 8 | ||||
| -rw-r--r-- | indra/newview/app_settings/key_bindings.xml | 88 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 26 |
3 files changed, 23 insertions, 99 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 4e186292f7..3100baf943 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -207,14 +207,6 @@ <map> <key>map-to</key> <string>NoAudio</string> - </map> - - <key>noinvlib</key> - <map> - <key>desc</key> - <string>Do not request the inventory library.</string> - <key>map-to</key> - <string>NoInventoryLibrary</string> </map> <key>nonotifications</key> diff --git a/indra/newview/app_settings/key_bindings.xml b/indra/newview/app_settings/key_bindings.xml index 1a5157838c..55babc88bc 100644 --- a/indra/newview/app_settings/key_bindings.xml +++ b/indra/newview/app_settings/key_bindings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<keys> +<keys xml_version="1"> <first_person> <binding key="A" mask="NONE" command="slide_left"/> <binding key="D" mask="NONE" command="slide_right"/> @@ -17,22 +17,13 @@ <binding key="PGDN" mask="NONE" command="push_down"/> <binding key="HOME" mask="NONE" command="toggle_fly"/> - <binding key="PAD_LEFT" mask="NONE" command="slide_left"/> - <binding key="PAD_RIGHT" mask="NONE" command="slide_right"/> - <binding key="PAD_UP" mask="NONE" command="push_forward"/> - <binding key="PAD_DOWN" mask="NONE" command="push_backward"/> - <binding key="PAD_PGUP" mask="NONE" command="jump"/> - <binding key="PAD_PGDN" mask="NONE" command="push_down"/> - <binding key="PAD_HOME" mask="NONE" command="toggle_fly"/> - <binding key="PAD_CENTER" mask="NONE" command="stop_moving"/> - <binding key="PAD_ENTER" mask="NONE" command="start_chat"/> - <binding key="PAD_DIVIDE" mask="NONE" command="start_gesture"/> - <binding key="SPACE" mask="NONE" command="stop_moving"/> <binding key="ENTER" mask="NONE" command="start_chat"/> <binding key="DIVIDE" mask="NONE" command="start_gesture"/> <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/> + + <binding key="" mask="NONE" mouse="LMB" command="script_trigger_lbutton"/> </first_person> <third_person> <binding key="A" mask="NONE" command="turn_left"/> @@ -60,19 +51,6 @@ <binding key="PGDN" mask="NONE" command="push_down"/> <binding key="HOME" mask="NONE" command="toggle_fly"/> - <binding key="PAD_LEFT" mask="NONE" command="turn_left"/> - <binding key="PAD_LEFT" mask="SHIFT" command="slide_left"/> - <binding key="PAD_RIGHT" mask="NONE" command="turn_right"/> - <binding key="PAD_RIGHT" mask="SHIFT" command="slide_right"/> - <binding key="PAD_UP" mask="NONE" command="push_forward"/> - <binding key="PAD_DOWN" mask="NONE" command="push_backward"/> - <binding key="PAD_PGUP" mask="NONE" command="jump"/> - <binding key="PAD_PGDN" mask="NONE" command="push_down"/> - <binding key="PAD_HOME" mask="NONE" command="toggle_fly"/> - <binding key="PAD_CENTER" mask="NONE" command="stop_moving"/> - <binding key="PAD_ENTER" mask="NONE" command="start_chat"/> - <binding key="PAD_DIVIDE" mask="NONE" command="start_gesture"/> - <!--Camera controls in third person on Alt--> <binding key="LEFT" mask="ALT" command="spin_around_cw"/> <binding key="RIGHT" mask="ALT" command="spin_around_ccw"/> @@ -88,15 +66,6 @@ <binding key="E" mask="ALT" command="spin_over"/> <binding key="C" mask="ALT" command="spin_under"/> - <binding key="PAD_LEFT" mask="ALT" command="spin_around_cw"/> - <binding key="PAD_RIGHT" mask="ALT" command="spin_around_ccw"/> - <binding key="PAD_UP" mask="ALT" command="move_forward"/> - <binding key="PAD_DOWN" mask="ALT" command="move_backward"/> - <binding key="PAD_PGUP" mask="ALT" command="spin_over"/> - <binding key="PAD_PGDN" mask="ALT" command="spin_under"/> - <binding key="PAD_ENTER" mask="ALT" command="start_chat"/> - <binding key="PAD_DIVIDE" mask="ALT" command="start_gesture"/> - <!--mimic alt zoom behavior with keyboard only--> <binding key="W" mask="CTL_ALT" command="spin_over"/> <binding key="S" mask="CTL_ALT" command="spin_under"/> @@ -104,9 +73,6 @@ <binding key="UP" mask="CTL_ALT" command="spin_over"/> <binding key="DOWN" mask="CTL_ALT" command="spin_under"/> - <binding key="PAD_UP" mask="CTL_ALT" command="spin_over"/> - <binding key="PAD_DOWN" mask="CTL_ALT" command="spin_under"/> - <!--Therefore pan on Alt-Shift--> <binding key="A" mask="CTL_ALT_SHIFT" command="pan_left"/> <binding key="D" mask="CTL_ALT_SHIFT" command="pan_right"/> @@ -118,14 +84,10 @@ <binding key="UP" mask="CTL_ALT_SHIFT" command="pan_up"/> <binding key="DOWN" mask="CTL_ALT_SHIFT" command="pan_down"/> - <binding key="PAD_LEFT" mask="CTL_ALT_SHIFT" command="pan_left"/> - <binding key="PAD_RIGHT" mask="CTL_ALT_SHIFT" command="pan_right"/> - <binding key="PAD_UP" mask="CTL_ALT_SHIFT" command="pan_up"/> - <binding key="PAD_DOWN" mask="CTL_ALT_SHIFT" command="pan_down"/> - <binding key="PAD_ENTER" mask="CTL_ALT_SHIFT" command="start_chat"/> - <binding key="PAD_DIVIDE" mask="CTL_ALT_SHIFT" command="start_gesture"/> - <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/> + <binding key="" mask="NONE" mouse="LMB" command="walk_to"/> + + <binding key="" mask="NONE" mouse="LMB" command="script_trigger_lbutton"/> </third_person> <sitting> <binding key="A" mask="ALT" command="spin_around_cw"/> @@ -167,16 +129,6 @@ <binding key="PGUP" mask="NONE" command="spin_over_sitting"/> <binding key="PGDN" mask="NONE" command="spin_under_sitting"/> - <binding key="PAD_LEFT" mask="NONE" command="spin_around_cw_sitting"/> - <binding key="PAD_RIGHT" mask="NONE" command="spin_around_ccw_sitting"/> - <binding key="PAD_UP" mask="NONE" command="move_forward_sitting"/> - <binding key="PAD_DOWN" mask="NONE" command="move_backward_sitting"/> - <binding key="PAD_PGUP" mask="NONE" command="spin_over_sitting"/> - <binding key="PAD_PGDN" mask="NONE" command="spin_under_sitting"/> - <binding key="PAD_CENTER" mask="NONE" command="stop_moving"/> - <binding key="PAD_ENTER" mask="NONE" command="start_chat"/> - <binding key="PAD_DIVIDE" mask="NONE" command="start_gesture"/> - <!--these are for passing controls when sitting on vehicles--> <binding key="A" mask="SHIFT" command="slide_left"/> <binding key="D" mask="SHIFT" command="slide_right"/> @@ -192,15 +144,6 @@ <binding key="PGUP" mask="SHIFT" command="spin_over_sitting"/> <binding key="PGDN" mask="SHIFT" command="spin_under_sitting"/> - <binding key="PAD_LEFT" mask="SHIFT" command="slide_left"/> - <binding key="PAD_RIGHT" mask="SHIFT" command="slide_right"/> - <binding key="PAD_UP" mask="SHIFT" command="move_forward_sitting"/> - <binding key="PAD_DOWN" mask="SHIFT" command="move_backward_sitting"/> - <binding key="PAD_PGUP" mask="SHIFT" command="spin_over_sitting"/> - <binding key="PAD_PGDN" mask="SHIFT" command="spin_under_sitting"/> - <binding key="PAD_ENTER" mask="SHIFT" command="start_chat"/> - <binding key="PAD_DIVIDE" mask="SHIFT" command="start_gesture"/> - <!--pan on Alt-Shift--> <binding key="A" mask="CTL_ALT_SHIFT" command="pan_left"/> <binding key="D" mask="CTL_ALT_SHIFT" command="pan_right"/> @@ -212,17 +155,12 @@ <binding key="UP" mask="CTL_ALT_SHIFT" command="pan_up"/> <binding key="DOWN" mask="CTL_ALT_SHIFT" command="pan_down"/> - <binding key="PAD_LEFT" mask="CTL_ALT_SHIFT" command="pan_left"/> - <binding key="PAD_RIGHT" mask="CTL_ALT_SHIFT" command="pan_right"/> - <binding key="PAD_UP" mask="CTL_ALT_SHIFT" command="pan_up"/> - <binding key="PAD_DOWN" mask="CTL_ALT_SHIFT" command="pan_down"/> - <binding key="PAD_ENTER" mask="CTL_ALT_SHIFT" command="start_chat"/> - <binding key="PAD_DIVIDE" mask="CTL_ALT_SHIFT" command="start_gesture"/> - <binding key="ENTER" mask="NONE" command="start_chat"/> <binding key="DIVIDE" mask="NONE" command="start_gesture"/> <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/> + + <binding key="" mask="NONE" mouse="LMB" command="script_trigger_lbutton"/> </sitting> <edit_avatar> <!--Avatar editing camera controls--> @@ -240,15 +178,9 @@ <binding key="PGDN" mask="NONE" command="edit_avatar_spin_under"/> <binding key="ENTER" mask="NONE" command="start_chat"/> <binding key="DIVIDE" mask="NONE" command="start_gesture"/> - <binding key="PAD_LEFT" mask="NONE" command="edit_avatar_spin_cw"/> - <binding key="PAD_RIGHT" mask="NONE" command="edit_avatar_spin_ccw"/> - <binding key="PAD_UP" mask="NONE" command="edit_avatar_move_forward"/> - <binding key="PAD_DOWN" mask="NONE" command="edit_avatar_move_backward"/> - <binding key="PAD_PGUP" mask="NONE" command="edit_avatar_spin_over"/> - <binding key="PAD_PGDN" mask="NONE" command="edit_avatar_spin_under"/> - <binding key="PAD_ENTER" mask="NONE" command="start_chat"/> - <binding key="PAD_DIVIDE" mask="NONE" command="start_gesture"/> <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/> + + <binding key="" mask="NONE" mouse="LMB" command="script_trigger_lbutton"/> </edit_avatar> </keys> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6c36fa6f09..b3be9d302e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4758,7 +4758,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>https://search.[GRID]/viewer/[CATEGORY]/?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD]</string> + <string>https://search.[GRID]/viewer/[CATEGORY]/?q=[QUERY]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD]</string> </map> <key>GuidebookURL</key> <map> @@ -5895,17 +5895,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>LoginAsGod</key> - <map> - <key>Comment</key> - <string>Attempt to login with god powers (Linden accounts only)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>LoginLocation</key> <map> <key>Comment</key> @@ -6964,6 +6953,17 @@ <key>Value</key> <integer>1000</integer> </map> + <key>FakeInitialOutfitName</key> + <map> + <key>Comment</key> + <string>Pretend that this is first time login and specified name was chosen</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> <key>MyOutfitsAutofill</key> <map> <key>Comment</key> @@ -7066,7 +7066,7 @@ <key>NoInventoryLibrary</key> <map> <key>Comment</key> - <string>Do not request inventory library.</string> + <string>(Deprecated) Do not request inventory library.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |