diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-25 12:39:46 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-25 12:39:46 -0700 |
| commit | 9aad318fb9b9480a87d87db902dd2f064d9348af (patch) | |
| tree | 2ee6663288dd21f03444a435addbb1925dd389e6 /indra/newview/app_settings | |
| parent | 18a476daceccd337e990eec367cac5b985c8836f (diff) | |
| parent | 62cd50fe1edd67308cf0a2e5407bd4005e705681 (diff) | |
Merged from 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 5eff08c6ed..50eee73c4c 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> |