diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-03 22:25:48 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-03 22:25:48 +0000 |
| commit | db5cda26676f376f18816013c0c5e3fbad5b20d0 (patch) | |
| tree | b50e52262d34f55b4eaf35a3a1952007ef0a69de /indra/newview/app_settings | |
| parent | 3c85899ee0db4a90d03ec687e514a31c1befe34e (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index edcd288b7d..3baf37826f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4760,6 +4760,17 @@ <key>Value</key> <integer>5</integer> </map> + <key>ToastOpaqueTime</key> + <map> + <key>Comment</key> + <string>Width of notification messages</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>4</integer> + </map> <key>StartUpToastTime</key> <map> <key>Comment</key> @@ -4769,7 +4780,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>10</integer> + <integer>5</integer> </map> <key>ToastMargin</key> <map> @@ -6765,6 +6776,17 @@ <key>ShowCrosshairs</key> <map> <key>Comment</key> + <string>Show Coordinates in Location Input Field</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>ShowCoordinatesOption</key> + <map> + <key>Comment</key> <string>Display crosshairs when in mouselook mode</string> <key>Persist</key> <integer>1</integer> @@ -9623,5 +9645,16 @@ <key>Value</key> <integer>0</integer> </map> + <key>GroupTeleportMembersLimit</key> + <map> + <key>Comment</key> + <string>Max number of members of group to offer teleport</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>100</integer> + </map> </map> </llsd> |