From ebf66ebe9dc54ddae4c06dcd2462b6210115f86e Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 24 Jun 2012 17:27:33 -0400
Subject: [PATCH] XML UI Enhancements

Added History Button to group conferences and group chats.
Added Inventory Expand All icon and button added to inventory floater.
Thanks to Naudia Nadezda for pointing out that these parts of UI just work.
---
 .../skins/default/textures/inv_expand_all.tga     | Bin 0 -> 566 bytes
 .../xui/en-us/floater_instant_message_ad_hoc.xml  |   3 ++-
 .../xui/en-us/floater_instant_message_group.xml   |   1 +
 .../skins/default/xui/en-us/floater_inventory.xml |   9 ++++++---
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/inv_expand_all.tga

diff --git a/indra/newview/skins/default/textures/inv_expand_all.tga b/indra/newview/skins/default/textures/inv_expand_all.tga
new file mode 100644
index 0000000000000000000000000000000000000000..d6e92c20babe0c7d3742b5f61f21ca435e2a9fad
GIT binary patch
literal 566
zcmZ`$TMEK35Zw9zv3~RjUO;bAp&$yr@ZXa}t$tYWUvj2ir(Y%ROq*0FE+yH{?#%2G
zk*WAdB$4^#?VOV<jzSC0AQQ3Hy)I>mw8dgzwscNEz|5`B^+pZ<xIr~&8nNMri7G1+
zvax4*wbr;Jt4OfUDeEct@$C^NL>P`3^gAchI_OGaIqrG`Z3wYXU2_ZMY&TFH_@w|B
z4Wf+TtT}b)9K!`8_#yw@J^B-@F}z6E1JqvI14xc3M9ab_<MLHiHOq5yLKrwl7oYeJ
eQUpw6Mx5`@Lt(~YcT7*&KHF{<=T){&m+}P>X;Wwb

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
index de5d8110d..28571554e 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
@@ -10,7 +10,8 @@
 	<string name="default_text_label">Click here to instant message.</string>
 	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="280" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
 		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="295" left="0" min_width="115" name="im_contents_panel" width="495">
-			<button bottom="-20" enabled="false" follows="left|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left="5" name="start_call_btn" width="80"/>
+			<button bottom="-20" follows="left|top" height="20" label="History" left="5" name="history_btn" width="80"/>
+			<button bottom_delta="0" enabled="false" follows="left|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="80" name="start_call_btn" width="80"/>
 			<button bottom_delta="0" follows="left|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"/>
 			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="462" name="toggle_active_speakers_btn" right="495" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
 			<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="243" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 3590df565..e01c91cf2 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -14,6 +14,7 @@
 		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="295" left="0" min_width="210" name="im_contents_panel" width="495">
 			<button bottom="-20" follows="left|top" height="20" label="Group Info" left="5" name="group_info_btn" tab_group="0" width="80"/>
 			<button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="80" name="start_call_btn" width="80"/>
+			<button bottom_delta="0" follows="left|top" height="20" label="History" left_delta="80" name="history_btn" width="80"/>
 			<button bottom_delta="0" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" pad_right="12" visible="false" width="80"/>
 			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="462" name="toggle_active_speakers_btn" right="495" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
 			<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="243" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
diff --git a/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 0571d8518..aa860ce0b 100644
--- a/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -8,8 +8,11 @@
   <button left="6" bottom_delta="-26" height="22" width="22" follows="left|top" halign="center"
     label="" image_overlay="inv_collapse_all.tga" name="collapse_btn" mouse_opaque="true" font="SansSerif"
     tool_tip="Collapse All" />
-  <text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
-		height="16" left="30" bottom_delta="2" right="93">Quick Filter:</text>
+   <button left="28" bottom_delta="0" height="22" width="22" follows="left|top" halign="center"
+    label="" image_overlay="inv_expand_all.tga" name="Inventory.ExpandAll" mouse_opaque="true" font="SansSerif"
+    tool_tip="Expand All"/>
+ <text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
+		height="16" left="43" bottom_delta="2" right="108">Quick Filter:</text>
 	<!-- Inventory Type Filter Labels -->
 	<string name="filter_type_all">All Types</string>
 	<string name="filter_type_animation">Animations</string>
@@ -24,7 +27,7 @@
 	<string name="filter_type_texture">Textures</string>
 	<string name="filter_type_snapshot">Snapshots</string>
 	<string name="filter_type_custom">Custom...</string>
-	<combo_box name="Quick Filter" label="Quick Filter" follows="left|top|right" height="20" left="95" right="-6" bottom_delta="0">
+	<combo_box name="Quick Filter" label="Quick Filter" follows="left|top|right" height="20" left="110" right="-6" bottom_delta="0">
 		<combo_item name="filter_type_all">All Types</combo_item>
 		<separator />
 		<combo_item name="filter_type_animation">Animations</combo_item>