merge

--HG--
branch : product-engine

6 files changed, 14 insertions, 16 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 7cb973f4c8..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
@@ -33,7 +33,7 @@
     <chiclet_im_adhoc.new_message_icon
      bottom="12"
      height="13"
-     image_name="Unread_IM"
+     image_name="Unread_Chiclet"
      left="12"
      name="new_message_icon"
      visible="false"
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 a9b567225e..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
@@ -34,7 +34,7 @@
     <chiclet_im_group.new_message_icon
      bottom="12"
      height="13"
-     image_name="Unread_IM"
+     image_name="Unread_Chiclet"
      left="12"
      name="new_message_icon"
      visible="false"
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 9283594a4c..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
@@ -33,7 +33,7 @@
     <chiclet_im_p2p.new_message_icon
      bottom="12"
      height="13"
-     image_name="Unread_IM"
+     image_name="Unread_Chiclet"
      left="12"
      name="new_message_icon"
      visible="false"
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 5a22563758..33f85a964c 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -14,7 +14,7 @@
  <chiclet_offer.new_message_icon
   bottom="12"
   height="13"
-  image_name="Unread_IM"
+  image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
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 05a23b95f9..560c8e6ea5 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -14,7 +14,7 @@
  <chiclet_script.new_message_icon
   bottom="12"
   height="13"
-  image_name="Unread_IM"
+  image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
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 1368c6826d..67bb7c1896 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -3,15 +3,12 @@
 *TODO: Replace hardcoded buttons width/height with getting this info from the button images.
        Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
 -->
-
-
-
 <location_input font="SansSerifSmall"
                 add_landmark_image_enabled="Favorite_Star_Active"
                 add_landmark_image_disabled="Favorite_Star_Off"
                 add_landmark_image_hover="Favorite_Star_Over"
                 add_landmark_image_selected="Favorite_Star_Press"
-				add_landmark_hpad="12"
+		add_landmark_hpad="12"
                 icon_hpad="2"
                 allow_text_entry="true"
                 list_position="below"
@@ -26,8 +23,8 @@
     name="Place Information"
     width="16"
     height="16"
-    left="4" 
-    top="20" 
+    left="6"
+    top="20"
                           follows="left|top"
                           hover_glow_amount="0.15"
                           image_unselected="Info_Off"
@@ -55,7 +52,7 @@
     top="21"
     />
   <voice_icon
-    enabled="true" 
+    enabled="true"
     name="voice_icon"
     width="22"
     height="18"
@@ -97,11 +94,12 @@
     />
   <damage_icon
     name="damage_icon"
-    width="20"
-    height="16"
-    top="20"
+    width="14"
+    height="13"
+    top="22"
+    left="2"
     follows="right|top"
-    image_name="Parcel_Damage_Light"
+    image_name="Parcel_Damage_Dark"
     />
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text