summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-20 10:13:24 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-20 10:13:24 -0800
commitf38fa6a7357a91fcede3713cfce4971f0b0d5dfa (patch)
tree07ccb7b989cce22cfae95841802fc74d0749c040 /indra/newview/app_settings
parentf009fbcb03e7d4e87d41f60e2873ffcbcb02354b (diff)
parent8758fac7124ff07f2a003bf5719c19a4dab170b9 (diff)
PE merge.
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 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>