merge from remote repo

3 files changed, 34 insertions, 5 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
new file mode 100644
index 0000000000..0c8a2af002
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="101"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="Object Icon Menu"
+ top="724"
+ visible="false"
+ width="128">
+    <menu_item_call
+     label="Object Profile..."
+     layout="topleft"
+     name="Object Profile">
+        <menu_item_call.on_click
+         function="ObjectIcon.Action"
+         parameter="profile" />
+    </menu_item_call>
+    <menu_item_call
+     label="Block..."
+     layout="topleft"
+     name="Block">
+        <menu_item_call.on_click
+         function="ObjectIcon.Action"
+         parameter="block" />
+    </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index f747c557e2..8aaa462aaf 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -47,17 +47,17 @@
      top="6"
      use_ellipses="true"
      value="Unknown"
-     width="166" />
+     width="196" />
     <text
-     follows="left"
+     follows="right"
      font="SansSerifSmall"
      height="15"
      layout="topleft"
      left_pad="10"
-     name="avatar_status"
+     name="last_interaction"
      text_color="LtGray_50"
-     value="Away"
-     width="50" />
+     value="0s"
+     width="24" />
     <output_monitor
      auto_update="true"
      follows="right"
@@ -75,6 +75,7 @@
      image_pressed="Info_Press"
      image_hover="Info_Over"
      image_unselected="Info_Off"
+     layout="topleft"
      left_pad="3"
      right="-25"
      name="info_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 69089e0e26..0db5a41cc5 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -303,6 +303,7 @@ background_visible="true"
              left="0"
              multi_select="true"
              name="avatar_list"
+             show_last_interaction_time="true"
              top="2"
              width="313" />
             <panel