summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-01-21 15:58:35 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-01-21 15:58:35 -0500
commitaa68e0fd302bd91b7387bafa1ba19412ec98af4e (patch)
treeedc4a9a81111195ec275cf6d008427f6099e907e /indra/newview/app_settings
parentccc90257e7622bcf35454e8d4a0780f020ee6c39 (diff)
parent24c8ed10470b1fe6cc58ba5b2e07a34a183cb1c6 (diff)
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 00d3b6a798..a4fc095727 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1145,17 +1145,6 @@
<key>Value</key>
<integer>5</integer>
</map>
- <key>CallFloaterMaxItems</key>
- <map>
- <key>Comment</key>
- <string>Max number of visible participants in voice controls window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>CameraAngle</key>
<map>
<key>Comment</key>