From 49aa69495ce6830385693ae75a23d3f4985108e5 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 7 Oct 2009 08:54:08 -0700
Subject: Applied avatar height in customize window from Emerald viewer

---
 .../skins/default/xui/en-us/floater_customize.xml      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
index e7a7a7b..e02607c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -1057,6 +1057,24 @@ scratch and wear it.
 	</tab_container>
 	<scroll_container bottom="-476" follows="left|top|right|bottom" height="382" left="197"
 	     mouse_opaque="false" name="panel_container" opaque="false" width="292" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-400" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left="8" mouse_opaque="true" name="AvatarHeightText" v_pad="0" width="140">
+    Avatar Height:
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left="8" mouse_opaque="true" name="HeightText" v_pad="0" width="140">
+    Avatar Height
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left="8" mouse_opaque="true" name="HeightText2" v_pad="0" width="140">
+    Avatar Height2
+  </text>
 	<button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
 	     height="20" label="Close" label_selected="Close" mouse_opaque="true"
 	     name="Close" right="-10" scale_image="true" width="100" />
-- 
cgit v1.1


From 6989e0125a7041d3e21c6f53143aeedbb4e94b70 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 11 Oct 2009 06:59:37 -0700
Subject: Added next/prev buttons to windlight water window

---
 .../newview/skins/default/xui/en-us/floater_water.xml    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
index 9dcb96e..7038c93 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
@@ -11,17 +11,23 @@
 	     width="110">
 		Water Presets:
 	</text>
-	<combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
-	     left_delta="110" max_chars="20" mouse_opaque="true"
+	<combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
+	     left_delta="120" max_chars="20" mouse_opaque="true"
 	     name="WaterPresetsCombo" width="150" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
+	     mouse_opaque="true" name="prev" scale_image="true" width="20" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
+	     mouse_opaque="true" name="next" scale_image="true" width="20" />
 	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="New" label_selected="New" left_delta="170"
+	     label="New" label_selected="New" left_delta="40"
 	     mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
 	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Save" label_selected="Save" left_delta="80"
+	     label="Save" label_selected="Save" left_delta="70"
 	     mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
 	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Delete" label_selected="Delete" left_delta="80"
+	     label="Delete" label_selected="Delete" left_delta="70"
 	     mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
 	<tab_container bottom="-240" follows="left|top" height="180" left="0"
 	     mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
-- 
cgit v1.1


From f7fa0b1afa99596df47f68511d0fddf7522448fc Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 11 Oct 2009 07:53:03 -0700
Subject: Added advanced water and windlight sky tabs to sky presets pulldown

---
 .../skins/default/xui/en-us/panel_windlight_remote.xml       | 12 ++++++++++++
 .../default/xui/en-us/panel_windlight_remote_expanded.xml    | 12 ++++++++++++
 2 files changed, 24 insertions(+)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
index ead9ad7..8be72fc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
@@ -4,6 +4,18 @@
      name="windlight_remote" use_bounding_rect="true" width="182">
 	<panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="182" />
 	<panel bottom="3" filename="panel_windlight_controls.xml" name="panel_windlight_controls" height="20" left="0" width="182" />
+  <string name="atmosphere">
+    Atmosphere
+  </string>
+  <string name="lighting">
+    Lighting
+  </string>
+    <string name="clouds">
+    Clouds
+  </string>
+    <string name="advanced_water">
+    Advanced Water
+  </string>
   <string name="sunrise">
     Sunrise
   </string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
index e7182fa..8c43682 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -16,6 +16,18 @@
     m
   </text>
 	<panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
+  <string name="atmosphere">
+    Atmosphere
+  </string>
+  <string name="lighting">
+    Lighting
+  </string>
+  <string name="clouds">
+    Clouds
+  </string>
+  <string name="advanced_water">
+    Advanced Water
+  </string>
   <string name="sunrise">
     Sunrise
   </string>
-- 
cgit v1.1


From 78bf5bb8a01a0965b83a052bb8bbd13b38b94478 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 11 Oct 2009 08:54:03 -0700
Subject: Added particle count to windlight toolbar

---
 .../xui/en-us/panel_windlight_remote_expanded.xml      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
index 8c43682..4cb49a3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="0"
-     follows="right|bottom" height="47" left="0" mouse_opaque="true"
+     follows="right|bottom" height="67" left="0" mouse_opaque="true"
      name="windlight_remote" use_bounding_rect="true" width="182">
-	<panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="182" />
+	<panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" />
 	<slider bottom="-20" can_edit_text="false" control_name="RenderFarClip"
-	     decimal_digits="0" enabled="true" height="18"
-	     increment="8" initial_val="160" label="Draw Distance:"
-	     label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true"
-	     name="DrawDistance" show_text="true" width="170" />
+       decimal_digits="0" enabled="true" height="18"
+       increment="8" initial_val="160" label="Draw Distance:"
+       label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true"
+       name="DrawDistance" show_text="true" width="170" />
+  <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
+       decimal_digits="0" enabled="true" follows="left|top" height="18"
+       increment="256" initial_val="4096"
+       label="Max. Particles:" label_width="78" left_delta="0"
+       max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
+       show_text="true" width="176" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-- 
cgit v1.1


From e0561134ee559f9ea729f940cf9d4390f60c66d5 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 12 Oct 2009 00:51:28 -0700
Subject: Added script load/save from Meerkat viewer

---
 .../newview/skins/default/xui/en-us/floater_script_ed_panel.xml     | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index b83a6df..653c75b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -35,6 +35,12 @@
 			     width="138" />
 			<menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
 			     mouse_opaque="true" name="Revert All Changes" width="138" />
+      <menu_item_separator bottom_delta="-66" height="8" left="0" mouse_opaque="true" name="separator"
+     width="138" />
+      <menu_item_call bottom_delta="-76" height="20" label="Save to Disk" left="0"
+     mouse_opaque="true" name="Save to Disk" width="138" />
+      <menu_item_call bottom_delta="-96" height="20" label="Load from Disk" left="0"
+     mouse_opaque="true" name="Load from Disk" width="138" />
 		</menu>
 		<menu bottom="665" drop_shadow="true" enabled="true" height="198"
 		     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
-- 
cgit v1.1


From d32fe349f107679b9739b045f5d56f9003456cbf Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 12 Oct 2009 00:54:13 -0700
Subject: Removed reference to 'Second Life' from postcard message a la Meerkat

---
 linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
index 631db0d..9cf7b5f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
@@ -43,7 +43,7 @@
 	<button bottom_delta="0" follows="right|bottom" height="20" label="Send"
 	     left_delta="-106" name="send_btn" width="100" />
 	<string name="default_subject">
-		Postcard from Second Life.
+		Postcard from a virtual world.
 	</string>
 	<string name="default_message">
 		Check this out!
-- 
cgit v1.1


From 9ced46508d934ee507ddd3f8e036bbc9e6bc4d9b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 12 Oct 2009 02:51:57 -0700
Subject: Added check/uncheck all buttons for make outfit from Meerkat viewer

---
 .../newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml   | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
index 568f155..27a08c1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
@@ -225,6 +225,12 @@ now wearing into it.
 	     width="489">
 		Items to include in outfit:
 	</text>
+  <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Check All" left_delta="200" mouse_opaque="true"
+	     name="Check All" scale_image="true" width="90" />
+  <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Uncheck All" left_delta="100" mouse_opaque="true"
+	     name="Uncheck All" scale_image="true" width="90" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
-- 
cgit v1.1


From 04f607ec08a572f7a98f267677f127a01a5369c3 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 12 Oct 2009 05:18:32 -0700
Subject: Added avatar shape import and export from Meerkat viewer

---
 .../newview/skins/default/xui/en-us/floater_customize.xml      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
index e02607c..527ec4e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -1077,12 +1077,14 @@ scratch and wear it.
   </text>
 	<button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
 	     height="20" label="Close" label_selected="Close" mouse_opaque="true"
-	     name="Close" right="-10" scale_image="true" width="100" />
+	     name="Close" right="-10" scale_image="true" width="80" />
 	<button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
 	     height="20" label="Save All" label_selected="Save All" mouse_opaque="true"
-	     name="Save All" right="-116" scale_image="true" width="100" />
+	     name="Save All" right="-100" scale_image="true" width="80" />
 	<button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
 	     height="20" label="Make Outfit" label_selected="Make Outfit"
-	     mouse_opaque="true" name="Make Outfit" right="-222" scale_image="true"
-	     width="100" />
+	     mouse_opaque="true" name="Make Outfit" right="-190" scale_image="true"
+	     width="80" />
+  <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Export" label_selected="Export" right="-280" mouse_opaque="true" name="Export" scale_image="true" width="80" />
+  <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Import" label_selected="Import" right="-370" mouse_opaque="true" name="Import" scale_image="true" width="80" />
 </floater>
-- 
cgit v1.1


From 879e30e0617798a786f39b815668cec4e6dbc310 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 13 Oct 2009 04:06:49 -0700
Subject: Updated inventory search to include description (from Emerald)

---
 linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index f0c97f2..103a11e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -206,7 +206,7 @@
 			</menu_item_check>
 		</menu>
     <menu bottom_delta="64" drop_shadow="true" height="49"
-		     label="Search" left="0" mouse_opaque="false" name="Sort" opaque="true"
+		     label="Search" left="0" mouse_opaque="false" name="Search" opaque="true"
 		     tear_off="true" width="118">
       <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByName" height="18"
 			     label="By Name" left="0" mouse_opaque="true" name="By Name" width="118">
@@ -216,6 +216,10 @@
            label="By Creator" left="0" mouse_opaque="true" name="By Creator" width="118">
         <on_click filter="" function="Inventory.SetSearchBy" userdata="creator" />
       </menu_item_check>
+      <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByDesc" height="18"
+          label="By Description" left="0" mouse_opaque="true" name="By Description" width="118">
+        <on_click filter="" function="Inventory.SetSearchBy" userdata="desc" />
+      </menu_item_check>
       <menu_item_separator bottom_delta="-8" height="8" left="0" mouse_opaque="true" name="separator"
 			     width="118" />
       <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByAll" height="18"
-- 
cgit v1.1


From f716f71a8266788cfcf1d7570a03104d06bcf97e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 13 Oct 2009 08:02:51 -0700
Subject: Applied show IM logs button from Emerald viewer and added an alert if
 there is no history

---
 linden/indra/newview/skins/default/xui/en-us/alerts.xml          | 9 +++++++++
 .../newview/skins/default/xui/en-us/floater_instant_message.xml  | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index edfe62c..24683f0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -5222,6 +5222,15 @@ WARNING: Don't restore if you aren't sure where the object will go!
 		</option>
 	</alert>
 
+  <alert modal="true" name="IMLogNotFound">
+    <message name="message">
+      IM history could not be found for [NAME].
+    </message>
+    <option name="OK">
+      OK
+    </option>
+  </alert>
+
   <!-- [RLVa:KB] -->
 	<alert modal="true" name="FirstRLVGiveToRLV">
 		<message name="message">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 9a60f57..22e7f1e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -39,9 +39,11 @@
 	<button bottom_delta="0" follows="left|top" font="SansSerif"
 	     halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
 	     mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
+  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="107"
+          name="history_btn" visible="true" width="85" />
 	<button bottom="-40" follows="left|top" halign="center" height="20"
 	     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-	     label="Call" left_delta="107" name="start_call_btn" width="100" />
+	     label="Call" left_delta="92" name="start_call_btn" width="100" />
 	<button bottom="-40" follows="left|top" halign="center" 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="10"
-- 
cgit v1.1


From adc1da22ce2ad595a19e9d8aea94cb5943f76a6e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 13 Oct 2009 10:16:26 -0700
Subject: Disable IM history button for Linux and Mac users

---
 .../newview/skins/default/xui/en-us/floater_instant_message.xml     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 22e7f1e..b947fad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -39,15 +39,15 @@
 	<button bottom_delta="0" follows="left|top" font="SansSerif"
 	     halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
 	     mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
-  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="107"
-          name="history_btn" visible="true" width="85" />
 	<button bottom="-40" follows="left|top" halign="center" height="20"
 	     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-	     label="Call" left_delta="92" name="start_call_btn" width="100" />
+	     label="Call" left_delta="107" name="start_call_btn" width="100" />
 	<button bottom="-40" follows="left|top" halign="center" 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="10"
 	     visible="false" width="100" />
+  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="105"
+          name="history_btn" visible="true" width="85" />
   <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right" 
         text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
         bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
-- 
cgit v1.1


From 7e40a3f8b4bda96c53c74d50071a79924104da97 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 13 Oct 2009 10:23:26 -0700
Subject: Added history button for group chat as well

---
 .../newview/skins/default/xui/en-us/floater_instant_message_group.xml   | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 1156e9d..2e97d64 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -54,6 +54,8 @@
 			     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="92" />
+      <button bottom="-20" follows="left|top" halign="center" height="20" label="History" left_delta="97"
+              name="history_btn" visible="true" width="85" />
 			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
 			     label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
 			     right="176"
-- 
cgit v1.1