From 8366efc339e7eca3918d7246b3bb7a9ba61ce765 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 10 Sep 2012 08:38:49 -0700
Subject: CHUI-283, fixed a build problem and also added a missing file.

---
 .../en/widgets/conversation_view_participant.xml   | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100755 indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml

(limited to 'indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml')

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
new file mode 100755
index 0000000000..0cff25e083
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<conversation_view_participant
+  folder_arrow_image="ForSale_Badge"
+  folder_indentation="8"
+  item_height="20" 
+  item_top_pad="4"
+  selection_image="Rounded_Square"
+  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
+     height="16"
+     image_pressed="Info_Press"
+     image_unselected="Info_Over"
+     layout="topleft"
+     left_pad="3"
+     right="225"
+     name="info_btn"
+     tab_stop="false"
+     top_delta="0"
+     width="16" />
+</conversation_view_participant>
-- 
cgit v1.2.3


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

---
 .../en/widgets/conversation_view_participant.xml   | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml')

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


From 2084d33c1ec827b4e8d975a3bf1232e971f704e2 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 13 Sep 2012 11:22:41 -0700
Subject: CHUI-283: Now the information icon only appears upon mousehover. Also
 the information/speaker icon are right justified.

---
 .../default/xui/en/widgets/conversation_view_participant.xml  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml')

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 0b5c1b9511..60015576b5 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
@@ -9,23 +9,22 @@
   follows="left|top|right"
 >
 <info_button
+	 follows="right"
+	 auto_update="true"
      height="16"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
      layout="topleft"
-     left_pad="3"
-     right="200"
+     right="-28"
      name="info_btn"
-     tab_stop="false"
-     top_delta="0"
      width="16" />
 <output_monitor
+	follows="right"
 	auto_update="true"
 	draw_border="false"
 	height="16"
 	layout="topleft"
-	left_pad="5"
-	right="225"
+	right="-3"
 	mouse_opaque="true"
 	name="speaking_indicator"
 	visible="true"
-- 
cgit v1.2.3


From 399ba09c08d8ccaf9b34daa8b743f837639b2f35 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 14 Sep 2012 18:47:39 -0700
Subject: CHUI-283: Now the info/speaker icon are better positioned within the
 participant item. Also the participant item now matches the height of the
 session (conversation) item.

---
 .../skins/default/xui/en/widgets/conversation_view_participant.xml   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml')

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 60015576b5..b00e8aaeee 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
@@ -2,7 +2,7 @@
 <conversation_view_participant
   folder_arrow_image="ForSale_Badge"
   folder_indentation="8"
-  item_height="20" 
+  item_height="24" 
   item_top_pad="4"
   selection_image="Rounded_Square"
   mouse_opaque="true"
@@ -10,11 +10,9 @@
 >
 <info_button
 	 follows="right"
-	 auto_update="true"
      height="16"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
-     layout="topleft"
      right="-28"
      name="info_btn"
      width="16" />
@@ -23,7 +21,6 @@
 	auto_update="true"
 	draw_border="false"
 	height="16"
-	layout="topleft"
 	right="-3"
 	mouse_opaque="true"
 	name="speaking_indicator"
-- 
cgit v1.2.3


From 3c8407f32cf947ee1631ed66bba7a676e8b3b670 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 18 Sep 2012 12:15:51 -0700
Subject: CHUI-283: Now the avatar icon loads in the user's avatar image.Also
 the avatar image is of proper size. The participant of the conversation is
 offset correctly as well.

---
 .../default/xui/en/widgets/conversation_view_participant.xml      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml')

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 b00e8aaeee..7ddcfe3b03 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
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <conversation_view_participant
   folder_arrow_image="ForSale_Badge"
-  folder_indentation="8"
+  folder_indentation="0"
   item_height="24" 
   item_top_pad="4"
   selection_image="Rounded_Square"
   mouse_opaque="true"
   follows="left|top|right"
 >
+<avatar_icon
+	 follows="left"
+     height="20"
+     default_icon_name="Generic_Person"
+     left="50"
+     width="20" />
 <info_button
 	 follows="right"
      height="16"
-- 
cgit v1.2.3


From 381c13d0e51c3c054fdf2afeff8a8bcb6fc7aa11 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 20 Sep 2012 16:12:28 -0700
Subject: CHUI-283: Refactor of how the layout is determined for
 LLFolderViewItem. Changed constant members that defined the layout to
 non-const member varaibles, which are populated using a .xml file.

---
 .../default/xui/en/widgets/conversation_view_participant.xml  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml')

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 7ddcfe3b03..a28d6e0209 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
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <conversation_view_participant
-  folder_arrow_image="ForSale_Badge"
+  folder_arrow_image="Folder_Arrow"
   folder_indentation="0"
   item_height="24" 
-  item_top_pad="4"
+  item_top_pad="0"
   selection_image="Rounded_Square"
   mouse_opaque="true"
   follows="left|top|right"
+  left_pad="0"
+  icon_pad="10"
+  icon_width="20"
+  text_pad="7"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2"
 >
 <avatar_icon
 	 follows="left"
-- 
cgit v1.2.3


From 6dd2bf36c52fa00732ed5a3910539f38c91ff173 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 21 Sep 2012 15:27:46 -0700
Subject: CHUI-283: Now the speaker/info icon positions are set based upon
 visibility.'

---
 .../skins/default/xui/en/widgets/conversation_view_participant.xml      | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml')

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 a28d6e0209..0024decd4c 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
@@ -19,7 +19,9 @@
 	 follows="left"
      height="20"
      default_icon_name="Generic_Person"
+	 layout="topleft"
      left="50"
+	 top="2"
      width="20" />
 <info_button
 	 follows="right"
-- 
cgit v1.2.3


From 9d9853082361b35987a70574b422c40e8ee04d93 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 30 Oct 2012 18:20:28 -0700
Subject: CHUI-471: Adjusted conversationview so that indentation of the avatar
 icon is dependent upon getIndentation() instead of modifying avatar icon's
 left value.

---
 .../skins/default/xui/en/widgets/conversation_view_participant.xml      | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml')

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 0024decd4c..b83d9122f7 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
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <conversation_view_participant
   folder_arrow_image="Folder_Arrow"
-  folder_indentation="0"
   item_height="24" 
   item_top_pad="0"
   selection_image="Rounded_Square"
@@ -20,7 +19,6 @@
      height="20"
      default_icon_name="Generic_Person"
 	 layout="topleft"
-     left="50"
 	 top="2"
      width="20" />
 <info_button
-- 
cgit v1.2.3