From 145dd30b9aaf6d2f53c606f5b0f30d3aefc1024b Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 11 Jan 2010 19:00:52 -0800
Subject: EXT-4032 - remove extra space in voice control panel

to be reviewed by Erica
---
 indra/newview/llcallfloater.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llcallfloater.cpp')

diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 1468f6d584..0025c10b24 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -314,7 +314,7 @@ void LLCallFloater::updateSession()
 	
 	//hide "Leave Call" button for nearby chat
 	bool is_local_chat = mVoiceType == VC_LOCAL_CHAT;
-	childSetVisible("leave_call_btn", !is_local_chat);
+	childSetVisible("leave_call_btn_panel", !is_local_chat);
 	
 	refreshParticipantList();
 	updateAgentModeratorState();
-- 
cgit v1.3


From 2d9d3d5d8653176b82578578c8c44769a03b102d Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Tue, 12 Jan 2010 10:57:23 -0800
Subject: moved floater-specific setting to settings.xml frmo string embedded
 in floater

---
 indra/newview/app_settings/settings.xml                     | 13 ++++++++++++-
 indra/newview/llcallfloater.cpp                             |  5 ++---
 .../newview/skins/default/xui/en/floater_voice_controls.xml |  9 +++------
 3 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'indra/newview/llcallfloater.cpp')

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"
@@ -32,10 +32,6 @@
     <string
      name="no_one_near">
         No one near has voice enabled
-    </string>
-    <string
-     name="max_visible_items">
-        5
     </string>
       <layout_stack
          clip="false"
@@ -126,6 +122,7 @@
          follows="left|right|top"
          height="24"
          layout="topleft"
+         background_visible="false"
          left="0"
          name="non_avatar_caller"
          top="10"
-- 
cgit v1.3


From eab73793fc0b1b3832a7ad190e0d62708f39be90 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Tue, 12 Jan 2010 11:49:56 -0800
Subject: fixed resizing logic not working for call floater

---
 indra/newview/llcallfloater.cpp                               | 5 +++--
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llcallfloater.cpp')

diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 008ebf43b4..c0efb85b51 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -51,6 +51,7 @@
 #include "lltransientfloatermgr.h"
 #include "llviewerwindow.h"
 #include "llvoicechannel.h"
+#include "lllayoutstack.h"
 
 static void get_voice_participants_uuids(std::vector<LLUUID>& speakers_uuids);
 
@@ -818,8 +819,8 @@ void reshape_floater(LLCallFloater* floater, S32 delta_height)
 		}
 	}
 
-	floater->reshape(floater_rect.getWidth(), floater_rect.getHeight());
-	floater->setRect(floater_rect);
+	floater->setShape(floater_rect);
+	floater->getChild<LLLayoutStack>("my_call_stack")->updateLayout(FALSE);
 }
 
 void LLCallFloater::reshapeToFitContent()
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 c438d28236..ae198d69a3 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -122,7 +122,6 @@
          follows="left|right|top"
          height="24"
          layout="topleft"
-         background_visible="false"
          left="0"
          name="non_avatar_caller"
          top="10"
-- 
cgit v1.3