diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/key_bindings.xml | 8 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 26 |
2 files changed, 28 insertions, 6 deletions
diff --git a/indra/newview/app_settings/key_bindings.xml b/indra/newview/app_settings/key_bindings.xml index 4f6deb1f98..2ec9a2586c 100644 --- a/indra/newview/app_settings/key_bindings.xml +++ b/indra/newview/app_settings/key_bindings.xml @@ -32,7 +32,7 @@ <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="MMB" command="voice_follow_key"/> </first_person> <third_person> <binding key="A" mask="NONE" command="turn_left"/> @@ -125,7 +125,7 @@ <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="MMB" command="voice_follow_key"/> <binding key="" mask="NONE" mouse="LMB" command="walk_to"/> </third_person> <sitting> @@ -223,7 +223,7 @@ <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="MMB" command="voice_follow_key"/> </sitting> <edit_avatar> <!--Avatar editing camera controls--> @@ -250,6 +250,6 @@ <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="MMB" command="voice_follow_key"/> </edit_avatar> </keys> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index eeb7e6f0aa..6d93ba927f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8308,13 +8308,13 @@ <key>PushToTalkToggle</key> <map> <key>Comment</key> - <string>Should the push-to-talk button behave as a toggle</string> + <string>Should the push-to-talk toolbar button behave as a toggle</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>QAMode</key> <map> @@ -12524,6 +12524,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>TextureFetchMinTimeToLog</key> + <map> + <key>Comment</key> + <string>If texture fetching time exceeds this value, texture fetch tester will log info</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>2.0</real> + </map> <key>TextureFetchFakeFailureRate</key> <map> <key>Comment</key> @@ -12612,6 +12623,17 @@ <key>Value</key> <integer>32</integer> </map> + <key>TextureListFetchingThreshold</key> + <map> + <key>Comment</key> + <string>If the ratio between fetched and all textures in the list is greater than this threshold, which we assume that almost all textures are fetched</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.97</real> + </map> <key>TextureLoadFullRes</key> <map> <key>Comment</key> |