summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-01-20 15:59:05 -0500
committerLoren Shih <seraph@lindenlab.com>2010-01-20 15:59:05 -0500
commitfd5ee757a5c9bb014fd021139e8b701a6007c9d0 (patch)
treeb74be57b620d59a57abf7693eed56debd769b766 /indra/newview/app_settings/settings.xml
parent362f288bc6c08f5f345b0b676ca5e3e1fae53c07 (diff)
parent5ca943cd0279d35ffdf584fa0de3b795645f276c (diff)
viewer2.0->viewer2.0 merge
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 69336243da..53ac1dc0b9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3664,17 +3664,6 @@
<key>Value</key>
<string />
</map>
- <key>IMInChat</key>
- <map>
- <key>Comment</key>
- <string>Copy IM into chat console</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>IMShowTimestamps</key>
<map>
<key>Comment</key>