summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-07 12:47:08 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-07 12:47:08 +0100
commit11e03dece4aa8417a3b6fd2234820d91f185875b (patch)
tree742c8d48a2a33c973f7ec0f2f20cab4e806bcb3c /indra/newview/app_settings/settings.xml
parentf0b1424cb8ec584c5b4a6cf74d1cd096090c06e1 (diff)
parent76922597c219f27c5372a8a92e26e77338eb2dc2 (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index bbf3f4fc75..4c52fb015f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5373,17 +5373,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <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>