From 0b2d019e612a5162d4d699a897ad57396d0e8f5e Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 8 Apr 2014 01:07:19 -0400
Subject: [PATCH] Latif's requested touch-ups for IM windows in concise mode.

Profile option for concise flyout.
Fix for ding in multi-user chats breaking button alignment.
---
 indra/newview/llimpanel.cpp                                 | 2 +-
 .../en-us/floater_instant_message_ad_hoc_concisebuttons.xml | 6 +++---
 .../xui/en-us/floater_instant_message_concisebuttons.xml    | 1 +
 .../en-us/floater_instant_message_group_concisebuttons.xml  | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index aaf79dbfc..76e81a87b 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -969,7 +969,7 @@ void copy_profile_uri(const LLUUID& id, bool group = false);
 
 void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
 {
-	if (value.isUndefined())
+	if (value.isUndefined() || value == LLSD(0))
 	{
 		LLAvatarActions::showProfile(mOtherParticipantUUID);
 		return;
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc_concisebuttons.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc_concisebuttons.xml
index 57188eac1..88bb69bcb 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc_concisebuttons.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="true" bottom="-298" can_close="true" can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="197" label="(unknown)" left="1" min_height="100" min_width="300" name="im_floater" rect_control="" title="(unknown)" width="501">
+<floater border="true" bottom="-298" can_close="true" can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="197" label="(unknown)" left="1" min_height="100" min_width="345" name="im_floater" rect_control="" title="(unknown)" width="501">
 	<string name="ringing">Joining Voice Chat...</string>
 	<string name="connected">Connected, click End Call to hang up</string>
 	<string name="hang_up">Left Voice Chat</string>
@@ -8,8 +8,8 @@
 	<string name="typing_start_string">[NAME] is typing...</string>
 	<string name="session_start_string">Starting session with [NAME], please wait.</string>
 	<string name="default_text_label">Click here to instant message.</string>
-	<button bottom="-20" follows="right|top" height="20" label="History" right="-165" name="history_btn" width="80"/>
-    <button bottom_delta="0" follows="left|top" height="20" left_delta="80" width="50" toggle="true" name="ding_btn" label="Ding">
+    <button bottom="-20" follows="right|top" height="20" label="History" right="-210" name="history_btn" width="80"/>
+    <button bottom_delta="0" follows="right|top" height="20" left_delta="80" width="50" toggle="true" name="ding_btn" label="Ding">
       <button.commit_callback function="FlipDing"/>
     </button>
     <button bottom_delta="0" enabled="false" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="50" name="start_call_btn" width="80"/>
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
index 80cb4e3b2..652f34afe 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
@@ -12,6 +12,7 @@
 	<string name="unavailable_text_label">Text chat is not available for this call.</string>
 	<string name="inventory_item_offered">Inventory item offered</string>
     <flyout_button bottom="-20" follows="right|top" halign="center" height="20" label="Profile" left="280" name="instant_message_flyout" width="80" list_position="below">
+      <flyout_button_item label="Profile" name="profile_item" value="0"/>
       <flyout_button_item label="History" name="history_btn" value="1"/>
       <flyout_button_item label="Offer Teleport" name="profile_tele_btn" value="2"/>
       <flyout_button_item label="Request Teleport" name="request_teleport_item" value="3"/>
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml
index f43c4b311..8a4cee179 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="true" bottom="-298" can_close="true" can_minimize="true" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="197" label="(unknown)" left="1" min_height="100" min_width="330" name="im_floater" rect_control="" title="(unknown)" width="501">
+<floater border="true" bottom="-298" can_close="true" can_minimize="true" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="197" label="(unknown)" left="1" min_height="100" min_width="375" name="im_floater" rect_control="" title="(unknown)" width="501">
 	<string name="ringing">Joining Voice Chat...</string>
 	<string name="connected">Connected, click End Call to hang up</string>
 	<string name="hang_up">Left Voice Chat</string>
@@ -10,9 +10,9 @@
 	<string name="default_text_label">Click here to instant message.</string>
 	<string name="moderated_chat_label">(Moderated: Voices off by default)</string>
 	<string name="muted_text_label">Your text chat has been disabled by a Group Moderator.</string>
-	<button bottom="-20" follows="right|top" height="20" label="Group Info" right="-245" name="group_info_btn" tab_group="0" width="80"/>
+    <button bottom="-20" follows="right|top" height="20" label="Group Info" right="-290" name="group_info_btn" tab_group="0" width="80"/>
 	<button bottom_delta="0" follows="right|top" height="20" label="History" left_delta="80" name="history_btn" width="80"/>
-    <button bottom_delta="0" follows="left|top" height="20" left_delta="80" width="50" toggle="true" name="ding_btn" label="Ding">
+    <button bottom_delta="0" follows="right|top" height="20" left_delta="80" width="50" toggle="true" name="ding_btn" label="Ding">
       <button.commit_callback function="FlipDing"/>
     </button>
     <button bottom_delta="0" enabled="false" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="50" name="start_call_btn" width="80"/>