diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-11-12 20:28:24 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-11-12 20:28:24 +0000 |
| commit | a879e13055f0bb759ee12e708184e95d8bd9be30 (patch) | |
| tree | d659c3f71dea7a4f213e9d855f331dc5af56c63a /indra/newview/app_settings | |
| parent | f89f19990cbb9f3f2e7473ac6c159098bdfabec7 (diff) | |
svn merge -c102054
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015
QAR-1016 joystick+spacenav improvements MERGE
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4d4ce6c326..b01fbbec4f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2221,7 +2221,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <real>1.0</real> + <integer>1</integer> </map> <key>Disregard96DefaultDrawDistance</key> <map> @@ -2232,7 +2232,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <real>1.0</real> + <integer>1</integer> </map> <key>DoubleClickAutoPilot</key> <map> @@ -4007,13 +4007,13 @@ <key>JoystickAvatarEnabled</key> <map> <key>Comment</key> - <string>Enables the Joystick to control Avatar movmement.</string> + <string>Enables the Joystick to control Avatar movement.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> - <string>1</string> + <integer>1</integer> </map> <key>JoystickAxis0</key> <map> @@ -4101,7 +4101,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <string>1</string> + <integer>0</integer> </map> <key>JoystickEnabled</key> <map> @@ -4119,11 +4119,11 @@ <key>Comment</key> <string>Enables the Joystick to control the flycam.</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> - <string>1</string> + <integer>1</integer> </map> <key>JoystickInitialized</key> <map> @@ -4136,6 +4136,17 @@ <key>Value</key> <string /> </map> + <key>JoystickRunThreshold</key> + <map> + <key>Comment</key> + <string>Input threshold to initiate running</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.25</real> + </map> <key>KeepAspectForSnapshot</key> <map> <key>Comment</key> |