diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 0c6d3d2d54f068d755c9e9cdd48c2e1476a08f95..1b929eca0e7ac0de5bf81952b98db47f030420df 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -35,6 +35,7 @@
 
 #include "llcallfloater.h"
 
+#include "llagentdata.h" // for gAgentID
 #include "llavatarlist.h"
 #include "llbottomtray.h"
 #include "llparticipantlist.h"
@@ -70,6 +71,8 @@ BOOL LLCallFloater::postBuild()
 		anchor_panel, this,
 		getDockTongue(), LLDockControl::TOP));
 
+	initAgentData();
+
 	// update list for current session
 	updateSession();
 
@@ -181,4 +184,16 @@ void LLCallFloater::updateTitle()
 
 	setTitle(title);
 }
+
+void LLCallFloater::initAgentData()
+{
+	childSetValue("user_icon", gAgentID);
+
+	std::string name;
+	gCacheName->getFullName(gAgentID, name);
+	childSetValue("user_text", name);
+
+	LLOutputMonitorCtrl* speaking_indicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
+	speaking_indicator->setSpeakerId(gAgentID);
+}
 //EOF
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index 94a19d92e041184ac61af319c7bc00c48a6b369f..d98af4d9a1e52c7755a0cb676c2a4fb4de8662dd 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -83,6 +83,7 @@ class LLCallFloater : public LLDockableFloater
 	void refreshPartisipantList();
 	void onCurrentChannelChanged(const LLUUID& session_id);
 	void updateTitle();
+	void initAgentData();
 
 private:
 	LLSpeakerMgr* mSpeakerManager;
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 3c12aed3a01424585aaa9b55a6407781a5dec94e..04696ca2e7b6e0e4c30a22a0a234708918c347d8 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -27,29 +27,30 @@
     <panel
      bevel_style="in"
      follows="left|right|top"
-     height="73"
+     height="62"
      layout="topleft"
      left="0"
      name="control_panel"
-     width="285">
+     width="282">
         <panel
-         height="20"
+         height="18"
+         follows="top|left|right"
          layout="topleft"
          left="10"
          name="my_panel"
-         width="262">
+         width="263">
             <avatar_icon
              enabled="false"
              follows="left|top"
              height="18"
-             image_name="Generic_Person"
+             default_icon_name="Generic_Person"
              layout="topleft"
              left="0"
              name="user_icon"
              top="0"
              width="18" />
             <text
-             follows="top|left"
+             follows="top|left|right"
              font="SansSerifSmallBold"
              height="16"
              layout="topleft"
@@ -57,8 +58,20 @@
              name="user_text"
              text_color="white"
              top="4"
+             use_ellipses="true" 
              value="Mya Avatar:"
-             width="80" />
+             width="210" />
+            <output_monitor
+             auto_update="true"
+             draw_border="false"
+             follows="right"
+             height="16"
+             layout="topleft"
+             name="speaking_indicator"
+             right="-1"
+             top="2" 
+             visible="true"
+             width="20" />
         </panel>
         <layout_stack
          bottom="10"