3 files changed, 17 insertions, 10 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 382793a497..e57b77e2df 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1141,7 +1141,18 @@
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Boolean</string>
+      <string>S32</string>
+      <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>
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 0025c10b24..008ebf43b4 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -864,9 +864,8 @@ S32 LLCallFloater::getParticipantItemHeight()
 
 S32 LLCallFloater::getMaxVisibleItems()
 {
-	S32 value = 5; // default value, in case convertToS32() fails.
-	LLStringUtil::convertToS32(getString("max_visible_items"), value);
-	return value;
+	static LLCachedControl<S32> max_visible_items(*LLUI::sSettingGroups["config"],"CallFloaterMaxItems");
+	return max_visible_items;
 }
 
 //EOF
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index c4a51bcff0..c438d28236 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -3,9 +3,9 @@
  can_resize="true"
  can_minimize="true"
  can_close="false"
- height="270"
+ height="275"
  layout="topleft"
- min_height="280"
+ min_height="100"
  min_width="190"
  name="floater_voice_controls"
  help_topic="floater_voice_controls"
@@ -33,10 +33,6 @@
      name="no_one_near">
         No one near has voice enabled
     </string>
-    <string
-     name="max_visible_items">
-        5
-    </string>
       <layout_stack
          clip="false"
          follows="all"
@@ -126,6 +122,7 @@
          follows="left|right|top"
          height="24"
          layout="topleft"
+         background_visible="false"
          left="0"
          name="non_avatar_caller"
          top="10"