Merge with trunk

1 files changed, 124 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml
new file mode 100644
index 0000000000..3a35465df2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_friends.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="all"
+ height="347"
+ layout="topleft"
+ name="friends"
+ width="100">
+    <panel.string
+     name="Multiple">
+        Multiple friends...
+    </panel.string>
+    <scroll_list
+     bottom="337"
+     column_padding="0"
+     draw_heading="true"
+     follows="left|top|bottom|right"
+     layout="topleft"
+     left="10"
+     multi_select="true"
+     name="friend_list"
+     right="-100"
+     search_column="1"
+     tool_tip="Hold shift or control while clicking to select multiple friends"
+     top="10">
+        <scroll_list.columns
+         image="ff_online_status_button.tga"
+         name="icon_online_status"
+         tool_tip="Online status"
+         width="20" />
+        <scroll_list.columns
+         dynamic_width="true"
+         label="Name"
+         name="friend_name"
+         tool_tip="Name" />
+        <scroll_list.columns
+         image="ff_visible_online_button.tga"
+         name="icon_visible_online"
+         tool_tip="Friend can see when you&apos;re online"
+         width="20" />
+        <scroll_list.columns
+         image="ff_visible_map_button.tga"
+         name="icon_visible_map"
+         tool_tip="Friend can locate you on the map"
+         width="20" />
+        <scroll_list.columns
+         image="ff_edit_mine_button.tga"
+         name="icon_edit_mine"
+         tool_tip="Friend can edit, delete or take objects"
+         width="20" />
+        <scroll_list.columns
+         image="ff_edit_theirs_button.tga"
+         name="icon_edit_theirs"
+         tool_tip="You can edit this friend&apos;s objects"
+         width="20" />
+        <scroll_list.columns
+         name="friend_last_update_generation"
+         width="0" />
+    </scroll_list>
+    <locate
+     bottom="7"
+     layout="topleft"
+     left="-90" />
+    <button
+     follows="top|right"
+     height="22"
+     label="IM/Call"
+     layout="topleft"
+     left_pad="10"
+     name="im_btn"
+     tool_tip="Open Instant Message session"
+     top_pad="3"
+     width="80" />
+    <button
+     follows="top|right"
+     height="22"
+     label="Profile"
+     layout="topleft"
+     left_delta="0"
+     name="profile_btn"
+     tool_tip="Show picture, groups, and other information"
+     top_pad="3"
+     width="80" />
+    <button
+     follows="top|right"
+     height="22"
+     label="Teleport..."
+     layout="topleft"
+     left_delta="0"
+     name="offer_teleport_btn"
+     tool_tip="Offer this friend a teleport to your current location"
+     top_pad="3"
+     width="80" />
+    <button
+     follows="top|right"
+     height="22"
+     label="Pay..."
+     layout="topleft"
+     left_delta="0"
+     name="pay_btn"
+     tool_tip="Give Linden dollars (L$) to this friend"
+     top_pad="3"
+     width="80" />
+    <button
+     follows="top|right"
+     height="22"
+     label="Remove..."
+     layout="topleft"
+     left_delta="0"
+     name="remove_btn"
+     tool_tip="Remove this person from your friends list"
+     top_pad="3"
+     width="80" />
+    <button
+     follows="top|right"
+     height="22"
+     label="Add..."
+     layout="topleft"
+     left_delta="0"
+     name="add_btn"
+     tool_tip="Offer friendship to a resident"
+     top_pad="13"
+     width="80" />
+</panel>