diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-06-25 08:55:46 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-06-25 08:55:46 -0400 |
| commit | 7aa6fd235d96fc1394b98eb48ad94471b6d5b4c9 (patch) | |
| tree | 9e00a401da8db6457051da2612423b1eeedd061a /indra/newview/app_settings | |
| parent | 23706afa6431e34f821baa925ada220b06833a97 (diff) | |
| parent | c77efc92e3ebcb9af9bb997e5b709484153844d4 (diff) | |
Merge from q/viewer-release
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1d635ef18a..d3cc5d6cb7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5338,7 +5338,7 @@ <string>Boolean</string> <key>Value</key> <integer>0</integer> - </map> + </map> <key>MouseSun</key> <map> <key>Comment</key> @@ -5350,7 +5350,18 @@ <key>Value</key> <integer>0</integer> </map> - <key>MuteAmbient</key> + <key>MultipleAttachments</key> + <map> + <key>Comment</key> + <string>Allow multiple objects to be attached to a single attachment point.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>MuteAmbient</key> <map> <key>Comment</key> <string>Ambient sound effects, such as wind noise, play at 0 volume</string> |