Backed out changeset d5b761982e63

This got pushed too early - sorry.  Sigh.

8 files changed, 86 insertions, 74 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 693c43f141..af0d338256 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,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_adhoc
+ font="SansSerif"
  height="25"
  name="im_adhoc_chiclet"
  show_speaker="false"
@@ -11,14 +12,15 @@
      left="25"
      name="speaker"
      visible="false"
-     width="20" />
+     width="20"/>
     <chiclet_im_adhoc.avatar_icon
      follows="left|top|bottom"
      height="22"
      mouse_opaque="true"
      name="adhoc_icon"
-     width="22" />
+     width="22"/>
     <chiclet_im_adhoc.unread_notifications
+     font="SansSerif"
      font_halign="center"
      height="25"
      left="25"
@@ -27,13 +29,13 @@
      text_color="white"
      v_pad="5"
      visible="false"
-     width="20" />
+     width="20"/>
     <chiclet_im_adhoc.new_message_icon
-  bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
+     bottom="12"
+     height="13"
+     image_name="Unread_Chiclet"
+     left="12"
+     name="new_message_icon"
+     visible="false"
+     width="13" />
 </chiclet_im_adhoc>
\ No newline at end of file
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..b1988a2d20 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,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_group
+ font="SansSerif"
  height="25"
  name="im_group_chiclet"
  show_speaker="false"
@@ -11,17 +12,17 @@
      left="25"
      name="speaker"
      visible="false"
-     width="20" />
+     width="20"/>
     <chiclet_im_group.group_icon
      default_icon="Generic_Group"
      follows="left|top|bottom"
-     height="18"
-  bottom_pad="4"
+     height="22"
      mouse_opaque="true"
      name="group_icon"
-     width="18" />
+     width="22"/>
     <chiclet_im_group.unread_notifications
      height="25"
+     font="SansSerif"
      font_halign="center"
      left="25"
      mouse_opaque="false"
@@ -31,11 +32,11 @@
      visible="false"
      width="20"/>
     <chiclet_im_group.new_message_icon
-bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
+     bottom="12"
+     height="13"
+     image_name="Unread_Chiclet"
+     left="12"
+     name="new_message_icon"
+     visible="false"
+     width="13" />
 </chiclet_im_group>
\ No newline at end of file
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..52fbce0de7 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,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_p2p
+ font="SansSerif"
  height="25"
  name="im_p2p_chiclet"
  show_speaker="false"
@@ -17,9 +18,10 @@
      height="22"
      mouse_opaque="true"
      name="avatar_icon"
-     width="22" />
+     width="22"/>
     <chiclet_im_p2p.unread_notifications
      height="25"
+     font="SansSerif"
      font_halign="center"
      left="25"
      mouse_opaque="false"
@@ -29,11 +31,11 @@
      visible="false"
      width="20"/>
     <chiclet_im_p2p.new_message_icon
-  bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
+     bottom="12"
+     height="13"
+     image_name="Unread_Chiclet"
+     left="12"
+     name="new_message_icon"
+     visible="false"
+     width="13" />
 </chiclet_im_p2p>
\ No newline at end of file
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..33f85a964c 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_offer
+ font="SansSerif"
  height="25"
  name="offer_chiclet"
  width="25">
  <chiclet_offer.icon
-  default_icon="Generic_Object_Small"
+  default_icon="Generic_Object_Small" 
   follows="all"
-  height="20"
+  height="22"
   mouse_opaque="false"
   name="chiclet_icon"
-  bottom_pad="2"
-  width="20" />
+  width="22"/>
  <chiclet_offer.new_message_icon
-  bottom="11"
-  height="14"
+  bottom="12"
+  height="13"
   image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
-  width="14" />
+  width="13" />
 </chiclet_offer>
\ 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 b1f9f5b0e8..560c8e6ea5 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_script
+ font="SansSerif"
  height="25"
  name="script_chiclet"
  width="25">
  <chiclet_script.icon
   follows="all"
-  height="20"
-  image_name="Generic_Object_Small"
+  height="22"
+  image_name="Generic_Object_Small" 
   mouse_opaque="false"
   name="chiclet_icon"
-  width="20"
-  bottom_pad="2" />
+  width="22"/>
  <chiclet_script.new_message_icon
-  bottom="11"
-  height="14"
+  bottom="12"
+  height="13"
   image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
-  width="14" />
+  width="13" />
 </chiclet_script>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
new file mode 100644
index 0000000000..4229f34c09
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<gesture_combo_box
+           label="Gestures" 
+           list_position="below"
+           max_chars="20"
+           follows="right|top">
+  <gesture_combo_box.combo_button name="Combobox Button"
+                          label=""
+                          hover_glow_amount="0.15"
+                          scale_image="true"
+                          image_unselected="ComboButton_Off"
+                          image_selected="ComboButton_Selected"
+                          image_disabled="ComboButton_Disabled"
+                          image_disabled_selected="ComboButton_Disabled_Selected" />
+  <gesture_combo_box.drop_down_button name="Drop Down Button"
+                              label=""
+                              halign="center"
+                              hover_glow_amount="0.15"
+                              scale_image="true"
+                 image_selected="PushButton_Selected_Press"
+                 image_pressed="PushButton_Press"
+		 image_pressed_selected="PushButton_Selected_Press"
+                              image_unselected="PushButton_Off"
+                              image_disabled="PushButton_Disabled"
+                              image_disabled_selected="PushButton_Selected_Disabled" />
+  <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
+                                scroll_bar_bg_visible="false" />
+  <gesture_combo_box.combo_editor name="Combo Text Entry"
+                          select_on_focus="true" />
+</gesture_combo_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
deleted file mode 100644
index 808683864d..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<gesture_combo_list
-    follows="right|top">
-    <gesture_combo_list.combo_button
-     name="Combolist Button"
-     label=""
-     layout="topleft"
-     halign="center"
-     hover_glow_amount="0.15"
-     mouse_opaque="false"
-     scale_image="true"
-     image_selected="PushButton_Selected_Press"
-     image_pressed="PushButton_Press"
-     image_pressed_selected="PushButton_Selected_Press"
-     image_unselected="PushButton_Off"
-     image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Selected_Disabled" />
-    <gesture_combo_list.combo_list 
-     bg_writeable_color="MenuDefaultBgColor"
-     scroll_bar_bg_visible="false" />
-</gesture_combo_list>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 1c0a8ba7c5..67bb7c1896 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -96,7 +96,7 @@
     name="damage_icon"
     width="14"
     height="13"
-    top="25"
+    top="22"
     left="2"
     follows="right|top"
     image_name="Parcel_Damage_Dark"
@@ -112,19 +112,17 @@
 	font="SansSerifSmall"
 	text_color="TextFgColor"
 	/>
-  <combo_button
-		name="Location History"
-                label=""
-                pad_right="0"/>
-  <combo_list
-	      bg_writeable_color="MenuDefaultBgColor"
-	      page_lines="10"
+
+  <combo_button name="Location History"
+                          label=""
+                          pad_right="0"/>
+  <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"
               scroll_bar_bg_visible="true" />
   <combo_editor name="Combo Text Entry"
-                text_pad_left="27"
+                text_pad_left="22"
                 select_on_focus="false"
                 font="SansSerifSmall"
                 bevel_style="none"
                 border_style="line"
-                border.border_thickness="0" />
+                border.border_thickness="0"/>
 </location_input>