merge

7 files changed, 43 insertions, 43 deletions

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 e5cad0df2e..63f08a4250 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
@@ -4,13 +4,13 @@
  name="im_adhoc_chiclet"
  show_speaker="false"
  width="25">
-    <chiclet_im_adhoc.chiclet_button 
-     height="23"
-     image_selected="PushButton_Selected"
+    <chiclet_im_adhoc.chiclet_button
+     height="25"
+     image_selected="PushButton_On"
      image_unselected="PushButton_Off"
      name="chiclet_button"
      tab_stop="false"
-     width="25"/>
+     width="25" />
     <chiclet_im_adhoc.speaker
      auto_update="true"
      draw_border="false"
@@ -20,13 +20,13 @@
      visible="false"
      width="20" />
     <chiclet_im_adhoc.avatar_icon
-     bottom="2"
+     bottom="3"
      follows="left|top|bottom"
-     height="19"
-     left="3"
+     height="20"
+     left="2"
      mouse_opaque="true"
      name="adhoc_icon"
-     width="18" />
+     width="21" />
     <chiclet_im_adhoc.unread_notifications
      halign="center"
      height="23"
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 70e4ea8d26..372a89cbc7 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
@@ -4,30 +4,30 @@
  name="im_group_chiclet"
  show_speaker="false"
  width="25">
-    <chiclet_im_group.chiclet_button 
-     height="23"
-     image_selected="PushButton_Selected"
+    <chiclet_im_group.chiclet_button
+     height="25"
+     image_selected="PushButton_On"
      image_unselected="PushButton_Off"
      name="chiclet_button"
      tab_stop="false"
-     width="25"/>
+     width="25" />
     <chiclet_im_group.speaker
      auto_update="true"
      draw_border="false"
-     height="23"
+     height="25"
      left="25"
      name="speaker"
      visible="false"
      width="20" />
     <chiclet_im_group.group_icon
-     bottom="2"
+     bottom="3"
      default_icon="Generic_Group"
      follows="left|top|bottom"
-     height="18"
-     left="3"
+     height="20"
+     left="2"
      mouse_opaque="false"
      name="group_icon"
-     width="19" />
+     width="21" />
     <chiclet_im_group.unread_notifications
      height="23"
      halign="center"
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 ec6500cf80..99807d4717 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
@@ -4,9 +4,9 @@
  name="im_p2p_chiclet"
  show_speaker="false"
  width="25">
-    <chiclet_im_p2p.chiclet_button 
-     height="23"
-     image_selected="PushButton_Selected"
+    <chiclet_im_p2p.chiclet_button
+     height="25"
+     image_selected="PushButton_On"
      image_unselected="PushButton_Off"
      name="chiclet_button"
      tab_stop="false"
@@ -18,15 +18,15 @@
      left="25"
      name="speaker"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_p2p.avatar_icon
-     bottom="2"
+     bottom="3"
      follows="left|top|bottom"
-     height="18"
-     left="3"
+     height="20"
+     left="2"
      mouse_opaque="false"
      name="avatar_icon"
-     width="19" />
+     width="21" />
     <chiclet_im_p2p.unread_notifications
      height="23"
      halign="center"
@@ -45,4 +45,4 @@
   name="new_message_icon"
   visible="false"
   width="14" />
-</chiclet_im_p2p>
\ No newline at end of file
+</chiclet_im_p2p>
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 1bf9bc9e71..4bc295f747 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -3,22 +3,22 @@
  height="23"
  name="offer_chiclet"
  width="25">
- <chiclet_offer.chiclet_button 
-  height="23"
-  image_selected="PushButton_Selected"
+ <chiclet_offer.chiclet_button
+  height="25"
+  image_selected="PushButton_On"
   image_unselected="PushButton_Off"
   name="chiclet_button"
   tab_stop="false"
-  width="25"/>
+  width="25" />
  <chiclet_offer.icon
-  bottom="2"
+  bottom="3"
   default_icon="Generic_Object_Small"
   follows="all"
-  height="18"
-  left="3"
+  height="20"
+  left="2"
   mouse_opaque="false"
   name="chiclet_icon"
-  width="19" />
+  width="21" />
  <chiclet_offer.new_message_icon
   bottom="11"
   height="14"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
index f3207ddeae..5f51f4afd9 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_panel
- name="chiclet_panel" 
+ name="chiclet_panel"
  chiclet_padding="3"
  scrolling_offset="40"
- scroll_button_hpad="5"
+ scroll_button_hpad="0"
  scroll_ratio="10"
  min_width="180"
  />
\ No newline at end of file
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 38d9904d13..db6a9434df 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -3,22 +3,22 @@
  height="23"
  name="script_chiclet"
  width="25">
- <chiclet_script.chiclet_button 
-  height="23"
-  image_selected="PushButton_Selected"
+ <chiclet_script.chiclet_button
+  height="25"
+  image_selected="PushButton_On"
   image_unselected="PushButton_Off"
   name="chiclet_button"
   tab_stop="false"
   width="25"/>
  <chiclet_script.icon
-  bottom="2"
+  bottom="3"
   follows="all"
   height="18"
   image_name="Generic_Object_Small"
-  left="3"
+  left="2"
   mouse_opaque="false"
   name="chiclet_icon"
-  width="19"/>
+ width="21"/>
  <chiclet_script.new_message_icon
   bottom="11"
   height="14"
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index bda88857ae..dfd301a770 100644
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
@@ -3,6 +3,6 @@
               border_color="ColorSwatchBorderColor"
               name="color_swatch">
   <color_swatch.caption_text name="caption"
-                             font="SansSerifSmall"
+                             halign="center"
                              follows="left|right|bottom"/>
 </color_swatch>