summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
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
commit4db872e11ea5d322c20de9ddde484cb39690c1a2 (patch)
tree742c8d48a2a33c973f7ec0f2f20cab4e806bcb3c /indra/newview/app_settings
parent78e7bde7ac65821084cb13a6a58b4f049e436be1 (diff)
parentff6eccd32db0cf57e16db8941b25a12dbb64b9fa (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/app_settings')
-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>