diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-06-24 17:38:12 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-06-24 17:38:12 -0400 |
commit | 1a2a25cb857044d3fa6e80d3edaf5c7a15e167a3 (patch) | |
tree | 3de0e009bcb6312c6ecf702eb925f8c150b5ad59 /indra/newview/app_settings | |
parent | 90148ccc0132366c1abcb42f75aa9a707c78ba20 (diff) |
EXT-7747 FIXED Turn on multiattachments for 2.1 as debug setting
This #ifdef is now keyed to MultipleAttachments debug setting
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> |