diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 16:42:45 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 16:42:45 -0700 |
| commit | 3e10fa4d51a23bf6f1ced23e8d90c636d84fa5db (patch) | |
| tree | d4991e4c1a9dd934f48d33804e55eb8ffa085679 /indra/newview/app_settings/settings.xml | |
| parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
| parent | f20e9521a9b70f4e83cbb6888feae08a70681ea7 (diff) | |
merge from latest svn/viewer-2-0 to hg/viewer-2-0
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f1e5acdd74..f898c2d0c1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1599,7 +1599,7 @@ <key>Cursor3D</key> <map> <key>Comment</key> - <string>Tread Joystick values as absolute positions (not deltas).</string> + <string>Treat Joystick values as absolute positions (not deltas).</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -3851,6 +3851,17 @@ <key>Value</key> <string /> </map> + <key>JoystickMouselookYaw</key> + <map> + <key>Comment</key> + <string>Pass joystick yaw to scripts in Mouselook.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>JoystickRunThreshold</key> <map> <key>Comment</key> @@ -4158,7 +4169,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>LipSyncOoh</key> <map> @@ -7632,6 +7643,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>ShowSnapshotButton</key> + <map> + <key>Comment</key> + <string>Show/Hide Snapshot button button in the bottom tray</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>ShowMoveButton</key> <map> <key>Comment</key> @@ -9656,17 +9678,6 @@ <key>Value</key> <integer>16</integer> </map> - <key>UITabCntrTabHeight</key> - <map> - <key>Comment</key> - <string>UI Tab Container Tab Height</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>16</integer> - </map> <key>UITabCntrTabHPad</key> <map> <key>Comment</key> |