Merge from viewer2. Minor conflict resolved.

8 files changed, 86 insertions, 41 deletions

diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index 8785dff2ae..ef885e8045 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chat_history
-	message_header="panel_chat_header.xml"
-    message_separator="panel_chat_separator.xml"
-    left_text_pad="10"
-	right_text_pad="15"
-    left_widget_pad="0"
-	right_widget_pad="10"
-	top_separator_pad="5"
-	bottom_separator_pad="5"
-	top_header_pad="17"
-	bottom_header_pad="10"
+  message_header="panel_chat_header.xml"
+  message_separator="panel_chat_separator.xml"
+  left_text_pad="10"
+  right_text_pad="15"
+  left_widget_pad="0"
+  right_widget_pad="10"
+  top_separator_pad="1"
+  bottom_separator_pad="1"
+  top_header_pad="12"
+  bottom_header_pad="5"
 	max_length="2147483647"
 	track_bottom="true"
 	name="chat_history"
 	type="string"
 	word_wrap="true"
+  line_spacing.multiple="1.0" 
   font="SansSerif">
   <more_chat_text
     mouse_opaque="true" 
     word_wrap="true"
     />
-</chat_history>
+</chat_history>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index 693c43f141..328d521636 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -1,31 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_adhoc
- height="25"
+ height="23"
  name="im_adhoc_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_adhoc.chiclet_button 
+     height="23"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     name="chiclet_button"
+     tab_stop="false"
+     width="25"/>
     <chiclet_im_adhoc.speaker
      auto_update="true"
      draw_border="false"
-     height="25"
+     height="23"
      left="25"
      name="speaker"
      visible="false"
      width="20" />
     <chiclet_im_adhoc.avatar_icon
+     bottom="2"
      follows="left|top|bottom"
-     height="22"
+     height="19"
+     left="3"
      mouse_opaque="true"
      name="adhoc_icon"
-     width="22" />
+     width="18" />
     <chiclet_im_adhoc.unread_notifications
      font_halign="center"
-     height="25"
+     height="23"
      left="25"
      mouse_opaque="false"
      name="unread"
      text_color="white"
-     v_pad="5"
+     v_pad="3"
      visible="false"
      width="20" />
     <chiclet_im_adhoc.new_message_icon
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index f4fc58701c..60658899ee 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -1,33 +1,41 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_group
- height="25"
+ height="23"
  name="im_group_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_group.chiclet_button 
+     height="23"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     name="chiclet_button"
+     tab_stop="false"
+     width="25"/>
     <chiclet_im_group.speaker
      auto_update="true"
      draw_border="false"
-     height="25"
+     height="23"
      left="25"
      name="speaker"
      visible="false"
      width="20" />
     <chiclet_im_group.group_icon
+     bottom="2"
      default_icon="Generic_Group"
      follows="left|top|bottom"
      height="18"
-  bottom_pad="4"
-     mouse_opaque="true"
+     left="3"
+     mouse_opaque="false"
      name="group_icon"
-     width="18" />
+     width="19" />
     <chiclet_im_group.unread_notifications
-     height="25"
+     height="23"
      font_halign="center"
      left="25"
      mouse_opaque="false"
      name="unread"
      text_color="white"
-     v_pad="5"
+     v_pad="3"
      visible="false"
      width="20"/>
     <chiclet_im_group.new_message_icon
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index 535113f717..b5b8f0d07a 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -1,31 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_p2p
- height="25"
+ height="23"
  name="im_p2p_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_p2p.chiclet_button 
+     height="23"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     name="chiclet_button"
+     tab_stop="false"
+     width="25"/>
     <chiclet_im_p2p.speaker
      auto_update="true"
      draw_border="false"
-     height="25"
+     height="23"
      left="25"
      name="speaker"
      visible="false"
      width="20"/>
     <chiclet_im_p2p.avatar_icon
+     bottom="2"
      follows="left|top|bottom"
-     height="22"
-     mouse_opaque="true"
+     height="18"
+     left="3"
+     mouse_opaque="false"
      name="avatar_icon"
-     width="22" />
+     width="19" />
     <chiclet_im_p2p.unread_notifications
-     height="25"
+     height="23"
      font_halign="center"
      left="25"
      mouse_opaque="false"
      name="unread"
      text_color="white"
-     v_pad="5"
+     v_pad="3"
      visible="false"
      width="20"/>
     <chiclet_im_p2p.new_message_icon
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
index 86bea9be50..1bf9bc9e71 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_offer
- height="25"
+ height="23"
  name="offer_chiclet"
  width="25">
+ <chiclet_offer.chiclet_button 
+  height="23"
+  image_selected="PushButton_Selected"
+  image_unselected="PushButton_Off"
+  name="chiclet_button"
+  tab_stop="false"
+  width="25"/>
  <chiclet_offer.icon
+  bottom="2"
   default_icon="Generic_Object_Small"
   follows="all"
-  height="20"
+  height="18"
+  left="3"
   mouse_opaque="false"
   name="chiclet_icon"
-  bottom_pad="2"
-  width="20" />
+  width="19" />
  <chiclet_offer.new_message_icon
   bottom="11"
   height="14"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index b1f9f5b0e8..38d9904d13 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_script
- height="25"
+ height="23"
  name="script_chiclet"
  width="25">
+ <chiclet_script.chiclet_button 
+  height="23"
+  image_selected="PushButton_Selected"
+  image_unselected="PushButton_Off"
+  name="chiclet_button"
+  tab_stop="false"
+  width="25"/>
  <chiclet_script.icon
+  bottom="2"
   follows="all"
-  height="20"
+  height="18"
   image_name="Generic_Object_Small"
+  left="3"
   mouse_opaque="false"
   name="chiclet_icon"
-  width="20"
-  bottom_pad="2" />
+  width="19"/>
  <chiclet_script.new_message_icon
   bottom="11"
   height="14"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml
index 53034afa61..58543338f6 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu bg_color="MenuDefaultBgColor"
       bg_visible="true"
-      drop_shadow="false"
+      drop_shadow="true"
       tear_off="false"
       shortcut_pad="15">
 </menu>
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
index 4520768216..63166f32b7 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
@@ -15,4 +15,6 @@
              background_visible="true"
              heading_height="23"
              draw_border="false"
-             draw_heading="false" />
+             draw_heading="false"
+             border.name="dig border"
+             border.bevel_style="in" />