CHUI-119 WIP Suppressed of the warnings (XML corrected); fixed the torn-off button's states

3 files changed, 28 insertions, 35 deletions

diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp
index c2621938e1..99b28255cd 100644
--- a/indra/newview/llimconversation.cpp
+++ b/indra/newview/llimconversation.cpp
@@ -85,11 +85,11 @@ BOOL LLIMConversation::postBuild()
 	mParticipantListPanel = getChild<LLLayoutPanel>("speakers_list_panel");
 
 	// Show the participants list in torn off floaters only.
-	mParticipantListPanel->setVisible(gSavedSettings.getBOOL("IMShowControlPanel")
-									  && !mIsNearbyChat); // *TODO: temporarily disabled for Nearby chat
-	mExpandCollapseBtn->setImageOverlay(
-				getString(mParticipantListPanel->getVisible() ? "collapse_icon" : "expand_icon"));
-	mExpandCollapseBtn->setEnabled(!mIsP2PChat);
+//	mParticipantListPanel->setVisible(gSavedSettings.getBOOL("IMShowControlPanel")
+//									  && !mIsNearbyChat); // *TODO: temporarily disabled for Nearby chat
+//	mExpandCollapseBtn->setImageOverlay(
+//				getString(mParticipantListPanel->getVisible() ? "collapse_icon" : "expand_icon"));
+//	mExpandCollapseBtn->setEnabled(!mIsP2PChat);
 
 	mTearOffBtn = getChild<LLButton>("tear_off_btn");
 	mTearOffBtn->setCommitCallback(boost::bind(&LLIMConversation::onTearOffClicked, this));
@@ -210,30 +210,22 @@ void LLIMConversation::updateHeaderAndToolbar()
 		}
 	}
 
-	bool is_control_panel_visible = false;
-		// Control panel should be visible only in torn off floaters.
-		is_control_panel_visible = !is_hosted && gSavedSettings.getBOOL("IMShowControlPanel");
-		mParticipantListPanel->setVisible(!mIsP2PChat && is_control_panel_visible
-				&& !mIsNearbyChat); // *TODO: temporarily disabled for Nearby chat
+	// Participant list should be visible only in torn off floaters.
+	bool is_participant_list_visible =
+			!is_hosted
+			&& gSavedSettings.getBOOL("IMShowControlPanel")
+			&& !mIsP2PChat
+			&& !mIsNearbyChat; // *TODO: temporarily disabled for Nearby chat
+
+	mParticipantListPanel->setVisible(is_participant_list_visible);
 
 	// Display collapse image (<<) if the floater is hosted
 	// or if it is torn off but has an open control panel.
-	bool is_expanded = is_hosted || is_control_panel_visible;
+	bool is_expanded = is_hosted || is_participant_list_visible;
 	mExpandCollapseBtn->setImageOverlay(getString(is_expanded ? "collapse_icon" : "expand_icon"));
 
-	LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(mSessionID);
-	if (session)
-	{
-		// The button (>>) should be disabled for torn off P2P conversations.
-		mExpandCollapseBtn->setEnabled(is_hosted || !session->isP2PSessionType());
-	}
-	else
-	{
-		if (!mIsNearbyChat)
-		{
-			llwarns << "IM session not found." << llendl;
-		}
-	}
+	// The button (>>) should be disabled for torn off P2P conversations.
+	mExpandCollapseBtn->setEnabled(is_hosted || !mIsP2PChat && !mIsNearbyChat);
 
 	if (mDragHandle)
 	{
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index e35dbf21d4..2f5a3a8767 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -126,7 +126,7 @@ LLNearbyChat::LLNearbyChat(const LLSD& key)
 :	LLIMConversation(key),
 	mChatBox(NULL),
 	mChatHistory(NULL),
-	mOutputMonitor(NULL),
+	//mOutputMonitor(NULL),
 	mSpeakerMgr(NULL),
 	mExpandedHeight(COLLAPSED_HEIGHT + EXPANDED_HEIGHT)
 {
@@ -152,8 +152,8 @@ BOOL LLNearbyChat::postBuild()
 	mChatBox->setEnableLineHistory(TRUE);
 	mChatBox->setFont(LLViewerChat::getChatFont());
 
-	mOutputMonitor = getChild<LLOutputMonitorCtrl>("chat_zone_indicator");
-	mOutputMonitor->setVisible(FALSE);
+//	mOutputMonitor = getChild<LLOutputMonitorCtrl>("chat_zone_indicator");
+//	mOutputMonitor->setVisible(FALSE);
 
 	// Register for font change notifications
 	LLViewerChat::setFontChangedCallback(boost::bind(&LLNearbyChat::onChatFontChange, this, _1));
@@ -184,6 +184,8 @@ BOOL LLNearbyChat::postBuild()
 		loadHistory();
 	}
 
+	setTitle(getString("NearbyChatTitle"));
+
 	return LLIMConversation::postBuild();
 }
 
@@ -718,12 +720,12 @@ void LLNearbyChat::displaySpeakingIndicator()
 
 	if (!id.isNull())
 	{
-		mOutputMonitor->setVisible(TRUE);
-		mOutputMonitor->setSpeakerId(id);
+		//mOutputMonitor->setVisible(TRUE);
+		//mOutputMonitor->setSpeakerId(id);
 	}
 	else
 	{
-		mOutputMonitor->setVisible(FALSE);
+		//mOutputMonitor->setVisible(FALSE);
 	}
 }
 
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 e5e005e36f..a4695b8c09 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -15,6 +15,9 @@
  can_tear_off="false"
  min_width="250"
  min_height="190">
+    <floater.string 
+     name="NearbyChatTitle"
+     value="Nearby Chat"/>
     <floater.string name="call_btn_start">VoicePTT_Off</floater.string>
     <floater.string name="call_btn_stop">VoicePTT_On</floater.string>
     <floater.string
@@ -131,9 +134,7 @@
   name="im_panels"
   tab_group="1"
   top_pad="0"
-  left="0"
-  auto_resize="true"
-  user_resize="true">
+  left="0">
     <layout_panel
       name="speakers_list_panel"
       follows="all"
@@ -185,8 +186,6 @@
           orientation="vertical"
           name="translate_and_chat_stack"
           tab_group="1"
-          auto_resize="true"
-          user_resize="true"
           left_pad="0"
           top="0"
           left="0">