Merge. Refresh from viewer-release after 3.6.10 release

1 files changed, 127 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/widgets/person_view.xml b/indra/newview/skins/default/xui/en/widgets/person_view.xml
new file mode 100644
index 0000000000..46c1b7ff75
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/person_view.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<person_view
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="5"
+  item_height="24" 
+  item_top_pad="3"
+  mouse_opaque="true"
+  follows="left|top|right"
+  icon_pad="4"
+  icon_width="20"
+  text_pad="6"
+  text_pad_left="4"
+  text_pad_right="4"
+  arrow_size="10"
+  max_folder_item_overlap="2">
+    <facebook_icon
+      follows="left"
+      height="14"
+      image_name="Facebook_Icon"
+      left="5"
+      bottom="6"
+      name="facebook_icon"
+      tool_tip="Facebook User"
+      visible="false"
+      width="14" />
+    <avatar_icon
+      follows="left"
+      layout="topleft"
+      height="20"
+      default_icon_name="Generic_Person"
+      left="5"
+      top="2"
+      visible="false"
+      width="20" />
+    <last_interaction_time_textbox
+      layout="topleft"
+      follows="right"
+      font="SansSerifSmall"
+      height="15"
+      left_pad="5"
+      right="-164"
+      name="last_interaction_time_textbox"
+      text_color="LtGray_50"
+      value="0s"
+      visible="false" 
+      width="35" />
+    <permission_edit_theirs_icon
+      layout="topleft"
+      height="16"
+      follows="right"
+      image_name="Permission_Edit_Objects_Theirs"
+      left_pad="3"
+      right="-129"
+      name="permission_edit_theirs_icon"
+      tool_tip="You can edit this friend&apos;s objects"
+      top="4"
+      visible="false" 
+      width="16" />
+    <permission_edit_mine_icon
+      layout="topleft"
+      height="16"
+      follows="right"
+      image_name="Permission_Edit_Objects_Mine"
+      left_pad="3"
+      right="-110"
+      name="permission_edit_mine_icon"
+      tool_tip="This friend can edit, delete or take your objects"
+      top="4"
+      visible="false" 
+      width="16" />
+    <permission_map_icon
+      height="16"
+      follows="right"
+      image_name="Permission_Visible_Map"
+      left_pad="3"
+      tool_tip="This friend can locate you on the map"
+      right="-91"
+      name="permission_map_icon"
+      visible="false" 
+      width="16" />
+    <permission_online_icon
+      height="16"
+      follows="right"
+      image_name="Permission_Visible_Online"
+      left_pad="3"
+      right="-72"
+      name="permission_online_icon"
+      tool_tip="This friend can see when you&apos;re online"
+      visible="false" 
+      width="16" />
+    <info_btn
+      follows="right"
+      height="16"
+      image_pressed="Info_Press"
+      image_unselected="Info_Over"
+      left_pad="3"
+      right="-53"
+      name="info_btn"
+      tool_tip="More info"
+      tab_stop="false"
+      visible="false"      
+      width="16" />
+    <profile_btn
+      layout="topleft"
+      follows="right"
+      height="20"
+      image_overlay="Web_Profile_Off"
+      left_pad="5"
+      right="-28"
+      name="profile_btn"
+      tab_stop="false"
+      tool_tip="View profile"
+      top="2"
+      visible="false"
+      width="20" />
+    <output_monitor
+      auto_update="true"
+      follows="right"
+      draw_border="false"
+      height="16"
+      right="-3"
+      mouse_opaque="true"
+      name="speaking_indicator"
+      visible="false"
+      width="20" />
+ </person_view>
+