diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:17:49 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:17:49 -0700 |
commit | 235afd7836d74305292067cd6c29fe0192d6201d (patch) | |
tree | 2cb0f2f9c817b9f70db8e115aaf69990555210ea /indra/newview/app_settings/settings.xml | |
parent | c90a90407c30415bf9700d3b037a0b8918e261d3 (diff) | |
parent | 011c3686a6e10edfe40adb67105298033188c1d6 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
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> |