From ef39011f433d93ea72cf636d4c415b468f776a01 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 10 Sep 2012 11:09:05 -0700
Subject: CHUI-283: Now displaying the speaker icon instead of the profile icon

---
 indra/newview/llconversationview.cpp               | 24 +++++++-------------
 indra/newview/llconversationview.h                 |  9 ++++----
 .../en/widgets/conversation_view_participant.xml   | 26 +++++++++++-----------
 3 files changed, 25 insertions(+), 34 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index d1a8478697..9c1c9aa225 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -93,8 +93,8 @@ static LLDefaultChildRegistry::Register<LLConversationViewParticipant> r("conver
 
 LLConversationViewParticipant::Params::Params() :	
 container(),
-view_profile_button("view_profile_button"),
-info_button("info_button")
+info_button("info_button"),
+output_monitor("output_monitor")
 {}
 
 LLConversationViewParticipant::LLConversationViewParticipant( const LLConversationViewParticipant::Params& p ):
@@ -104,23 +104,20 @@ LLConversationViewParticipant::LLConversationViewParticipant( const LLConversati
 }
 
 void LLConversationViewParticipant::initFromParams(const LLConversationViewParticipant::Params& params)
-{
-	LLButton::Params view_profile_button_params(params.view_profile_button());
-	LLButton * button = LLUICtrlFactory::create<LLButton>(view_profile_button_params);
-	addChild(button);
-	
+{	
 	LLButton::Params info_button_params(params.info_button());
-	button = LLUICtrlFactory::create<LLButton>(info_button_params);
+	LLButton * button = LLUICtrlFactory::create<LLButton>(info_button_params);
 	addChild(button);	
+
+    LLOutputMonitorCtrl::Params output_monitor_params(params.output_monitor());
+    LLOutputMonitorCtrl * outputMonitor = LLUICtrlFactory::create<LLOutputMonitorCtrl>(output_monitor_params);
+    addChild(outputMonitor);
 }
 
 BOOL LLConversationViewParticipant::postBuild()
 {
 	mInfoBtn = getChild<LLButton>("info_btn");
-	mProfileBtn = getChild<LLButton>("profile_btn");
-	
 	mInfoBtn->setClickedCallback(boost::bind(&LLConversationViewParticipant::onInfoBtnClick, this));
-	mProfileBtn->setClickedCallback(boost::bind(&LLConversationViewParticipant::onProfileBtnClick, this));
 	
 	
 	LLFolderViewItem::postBuild();
@@ -131,11 +128,6 @@ void LLConversationViewParticipant::onInfoBtnClick()
 {
 	
 	
-}
-
-void LLConversationViewParticipant::onProfileBtnClick()
-{
-	
 }
 
 LLButton* LLConversationViewParticipant::createProfileButton()
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h
index 0a008475a3..98eb32d44e 100755
--- a/indra/newview/llconversationview.h
+++ b/indra/newview/llconversationview.h
@@ -36,6 +36,7 @@
 #include "llcallbackmap.h"
 #include "lltextbox.h"
 #include "llbutton.h"
+#include "lloutputmonitorctrl.h"
 
 class LLIMFloaterContainer;
 
@@ -75,9 +76,9 @@ public:
     struct Params : public LLInitParam::Block<Params, LLFolderViewItem::Params>
     {
         Optional<LLIMFloaterContainer*>			container;
-		Optional<LLButton::Params>				view_profile_button,
-												info_button;
-
+		Optional<LLButton::Params>				info_button;
+        Optional<LLOutputMonitorCtrl::Params>   output_monitor;
+        
         Params();
     };
 
@@ -91,12 +92,10 @@ protected:
 	BOOL postBuild();
 
 	void onInfoBtnClick();
-	void onProfileBtnClick();	
 	
 private:
 	LLButton* createProfileButton();
 	LLButton * mInfoBtn;
-	LLButton * mProfileBtn;
 	
 
 };
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index 0cff25e083..0b5c1b9511 100755
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -8,26 +8,26 @@
   mouse_opaque="true"
   follows="left|top|right"
 >
-<view_profile_button
-     height="20"
-     image_overlay="Web_Profile_Off"
-     layout="topleft"
-     left_pad="5"
-     right="200"
-     name="profile_btn"
-     tab_stop="false"
-     tool_tip="View profile"
-     top_delta="-2"
-     width="20" />
- <info_button
+<info_button
      height="16"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
      layout="topleft"
      left_pad="3"
-     right="225"
+     right="200"
      name="info_btn"
      tab_stop="false"
      top_delta="0"
      width="16" />
+<output_monitor
+	auto_update="true"
+	draw_border="false"
+	height="16"
+	layout="topleft"
+	left_pad="5"
+	right="225"
+	mouse_opaque="true"
+	name="speaking_indicator"
+	visible="true"
+	width="20" />	 
 </conversation_view_participant>
-- 
cgit v1.2.3