PE merge.

12 files changed, 74 insertions, 20 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 31263fbea8..805ffbae66 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -47,6 +47,9 @@
      name="IM">
         <menu_item_call.on_click
          function="Avatar.IM" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_im" />
     </menu_item_call>
     <menu_item_call
      label="Call"
@@ -65,6 +68,9 @@
      name="Share">
         <menu_item_call.on_click
          function="Avatar.Share" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_share" />
     </menu_item_call>
     <menu_item_call
      label="Pay"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 172cf18fc4..8268937e7f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -304,8 +304,10 @@
             <name_box
              follows="left|top|right"
              height="30"
+             initial_value="(retrieving)"
              layout="topleft"
              left="0"
+             link="true"
              name="partner_text"
              top="0"
              width="285"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 8188048821..5b0a7107e4 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -88,6 +88,7 @@ background_visible="true"
      initial_value="(retrieving)"
      layout="topleft"
      left_delta="0"
+     link="true"
      name="founder_name"
      top_pad="2"
      use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 27c1af1860..2659156ba8 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -267,6 +267,7 @@
               <name_box
                follows="left|top"
                height="10"
+               initial_value="(retrieving)"
                layout="topleft"
                left="0"
                link="true"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 597b6410cd..2b907ed251 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -247,6 +247,7 @@
               <name_box
                follows="left|top"
                height="10"
+               initial_value="(retrieving)"
                layout="topleft"
                left="0"
                link="true"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index bfca2f2e46..7a6089c74e 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -53,7 +53,7 @@
      label_shadow="false"
      name="buycurrency"
      tool_tip="My Balance"
-     top="5"
+     top="3"
      width="100" />
     <button
      auto_resize="true"
@@ -71,7 +71,7 @@
      name="buyL"
      pad_right="20px"
      tool_tip="Click to buy more L$"
-     top="5"
+     top="2"
      width="100" />
     <text
      type="string"
@@ -80,7 +80,7 @@
      follows="right|bottom"
      halign="right"
      height="16"
-     top="7"
+     top="5"
      layout="topleft"
      left_pad="0"
      name="TimeText"
@@ -96,7 +96,7 @@
      image_unselected="Audio_Off"
      is_toggle="true"
      left_pad="18"
-     top="4"
+     top="2"
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index ba2d61afb7..d198237e5d 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -39,7 +39,8 @@
    name="toast_text"
    word_wrap="true"
    text_color="white"
-   top="5" 
+   top="5"
+   v_pad="5" 
     use_ellipses="true"
    width="260">
     Toast text;
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..2bec5b8a29 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,6 +4,13 @@
  name="im_adhoc_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_adhoc.chiclet_button 
+     height="25"
+     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"
@@ -13,11 +20,13 @@
      visible="false"
      width="20" />
     <chiclet_im_adhoc.avatar_icon
+     bottom="3"
      follows="left|top|bottom"
-     height="22"
+     height="19"
+     left="3"
      mouse_opaque="true"
      name="adhoc_icon"
-     width="22" />
+     width="19" />
     <chiclet_im_adhoc.unread_notifications
      font_halign="center"
      height="25"
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..1d7f3208af 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,6 +4,13 @@
  name="im_group_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_group.chiclet_button 
+     height="25"
+     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"
@@ -13,13 +20,14 @@
      visible="false"
      width="20" />
     <chiclet_im_group.group_icon
+     bottom="3"
      default_icon="Generic_Group"
      follows="left|top|bottom"
-     height="18"
-  bottom_pad="4"
-     mouse_opaque="true"
+     height="19"
+     left="3"
+     mouse_opaque="false"
      name="group_icon"
-     width="18" />
+     width="19" />
     <chiclet_im_group.unread_notifications
      height="25"
      font_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 535113f717..e6289f7cef 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,6 +4,13 @@
  name="im_p2p_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_p2p.chiclet_button 
+     height="25"
+     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"
@@ -13,11 +20,13 @@
      visible="false"
      width="20"/>
     <chiclet_im_p2p.avatar_icon
+     bottom="3"
      follows="left|top|bottom"
-     height="22"
-     mouse_opaque="true"
+     height="19"
+     left="3"
+     mouse_opaque="false"
      name="avatar_icon"
-     width="22" />
+     width="19" />
     <chiclet_im_p2p.unread_notifications
      height="25"
      font_halign="center"
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..138b50c968 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -3,14 +3,22 @@
  height="25"
  name="offer_chiclet"
  width="25">
+ <chiclet_offer.chiclet_button 
+  height="25"
+  image_selected="PushButton_Selected"
+  image_unselected="PushButton_Off"
+  name="chiclet_button"
+  tab_stop="false"
+  width="25"/>
  <chiclet_offer.icon
+  bottom="3"
   default_icon="Generic_Object_Small"
   follows="all"
-  height="20"
+  height="19"
+  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..ecf149dc76 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -3,14 +3,22 @@
  height="25"
  name="script_chiclet"
  width="25">
+ <chiclet_script.chiclet_button 
+  height="25"
+  image_selected="PushButton_Selected"
+  image_unselected="PushButton_Off"
+  name="chiclet_button"
+  tab_stop="false"
+  width="25"/>
  <chiclet_script.icon
+  bottom="3"
   follows="all"
-  height="20"
+  height="19"
   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"