Pull merge from richard/viewer-chui

10 files changed, 41 insertions, 29 deletions

diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 1943174872..c0a209f22d 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -347,14 +347,6 @@ void LLConversationViewSession::onCurrentVoiceSessionChanged(const LLUUID& sessi
 	if (vmi)
 	{
 		bool is_active = vmi->getUUID() == session_id;
-		bool is_nearby = vmi->getType() == LLConversationItem::CONV_SESSION_NEARBY;
-
-		if (is_nearby)
-		{
-			mSpeakingIndicator->setSpeakerId(is_active ? gAgentID : LLUUID::null);
-		}
-
-		mSpeakingIndicator->switchIndicator(is_active);
 		mCallIconLayoutPanel->setVisible(is_active);
 	}
 }
@@ -415,7 +407,6 @@ BOOL LLConversationViewParticipant::postBuild()
 	mInfoBtn->setClickedCallback(boost::bind(&LLConversationViewParticipant::onInfoBtnClick, this));
 	mInfoBtn->setVisible(false);
 
-	mActiveVoiceChannelConnection = LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLConversationViewParticipant::onCurrentVoiceSessionChanged, this, _1));
 	mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
 
     if (!sStaticInitialized)
@@ -485,21 +476,6 @@ S32 LLConversationViewParticipant::arrange(S32* width, S32* height)
     return arranged;
 }
 
-void LLConversationViewParticipant::onCurrentVoiceSessionChanged(const LLUUID& session_id)
-{
-	LLConversationItemParticipant* participant_model = dynamic_cast<LLConversationItemParticipant*>(getViewModelItem());
-	
-	if (participant_model)
-	{
-		LLConversationItemSession* parent_session = participant_model->getParentSession();
-		if (parent_session)
-		{
-			bool is_active = (parent_session->getUUID() == session_id);
-			mSpeakingIndicator->switchIndicator(is_active);
-		}
-	}
-}
-
 void LLConversationViewParticipant::refresh()
 {
 	// Refresh the participant view from its model data
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h
index 3e65823a23..1e20fb8b7e 100755
--- a/indra/newview/llconversationview.h
+++ b/indra/newview/llconversationview.h
@@ -147,7 +147,6 @@ protected:
 	void onInfoBtnClick();
 
 private:
-	void onCurrentVoiceSessionChanged(const LLUUID& session_id);
 
     LLAvatarIconCtrl* mAvatarIcon;
 	LLButton * mInfoBtn;
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index aaf43bdda0..3c85f21188 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1487,7 +1487,7 @@ LLConversationViewParticipant* LLFloaterIMContainer::createConversationViewParti
 	params.rect = LLRect (0, 24, panel_rect.getWidth(), 0);
 	params.tool_tip = params.name;
 	params.participant_id = item->getUUID();
-    params.folder_indentation = 42;
+    params.folder_indentation = 27;
 
 	return LLUICtrlFactory::create<LLConversationViewParticipant>(params);
 }
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp
index 3001029968..a0ca7286f1 100644
--- a/indra/newview/llfloaterimsession.cpp
+++ b/indra/newview/llfloaterimsession.cpp
@@ -102,6 +102,24 @@ void LLFloaterIMSession::refresh()
 }
 
 // virtual
+void LLFloaterIMSession::onTearOffClicked()
+{
+    LLFloaterIMSessionTab::onTearOffClicked();
+
+    if(mIsP2PChat)
+    {
+        if(isTornOff())
+        {
+            mSpeakingIndicator->setSpeakerId(mOtherParticipantUUID, mSessionID);
+        }
+        else
+        {
+            mSpeakingIndicator->setSpeakerId(LLUUID::null);
+        }
+    }
+}
+
+// virtual
 void LLFloaterIMSession::onClickCloseBtn()
 {
 	LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(mSessionID);
diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h
index 72a320041f..1d8957b1d9 100644
--- a/indra/newview/llfloaterimsession.h
+++ b/indra/newview/llfloaterimsession.h
@@ -135,6 +135,7 @@ private:
 
 	/*virtual*/ void refresh();
 
+    /*virtual*/ void onTearOffClicked();
 	/*virtual*/ void onClickCloseBtn();
 
 	// Update the window title and input field help text
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 82d25b9da9..ea99a1c5bf 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -54,6 +54,7 @@ LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id)
   ,  mSessionID(session_id.asUUID())
   , mConversationsRoot(NULL)
   , mScroller(NULL)
+  , mSpeakingIndicator(NULL)
   , mChatHistory(NULL)
   , mInputEditor(NULL)
   , mInputEditorTopPad(0)
@@ -206,6 +207,8 @@ BOOL LLFloaterIMSessionTab::postBuild()
 	mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
 	mScroller->setFollowsAll();
 	
+    mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
+
 	// Insert that scroller into the panel widgets hierarchy
 	mParticipantListPanel->addChild(mScroller);	
 	
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 4851904074..cd0bcd481c 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -149,6 +149,7 @@ protected:
 	LLFolderView* mConversationsRoot;
 	LLScrollContainer* mScroller;
 
+    LLOutputMonitorCtrl* mSpeakingIndicator;
 	LLChatHistory* mChatHistory;
 	LLChatEntry* mInputEditor;
 	int mInputEditorTopPad; // padding between input field and chat history
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index 02841e9831..f6e3c0cac0 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -260,6 +260,8 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id, const LLUUID& s
 	if (speaker_id.isNull() && mSpeakerId.notNull())
 	{
 		LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
+        switchIndicator(false);
+        mSpeakerId = speaker_id;
 	}
 
 	if (speaker_id.isNull() || (speaker_id == mSpeakerId))
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index faf54774f6..e4b127b7b9 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -106,6 +106,18 @@
                  name="voice_call_btn"
                  tool_tip="Open voice connection"
                  width="31"/>
+              <output_monitor
+                  auto_update="true"
+                  follows="top|left"
+                  draw_border="false"
+                  height="16"
+                  layout="topleft"
+                  top="10"
+                  left_pad="10"
+                  mouse_opaque="true"
+                  name="speaking_indicator"
+                  visible="false"
+                  width="20" />       
              <button
                  follows="right|top"
                  height="25"
diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index 5f475baa93..701233ba4a 100644
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -6,7 +6,7 @@
   can_resize="true"
   height="570"
   help_topic="sidebar_people"
-  min_height="440"
+  min_height="220"
   min_width="260"
   layout="topleft"
   name="floater_people"
@@ -14,13 +14,13 @@
   single_instance="true"
   reuse_instance="true"
   title="PEOPLE"
-  width="390">
+  width="370">
     <panel_container
       default_panel_name="panel_people"
       follows="all"
       height="570"
       name="main_panel"
-      width="390">
+      width="370">
       <panel
         class="panel_people"
         name="panel_people"