diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 9f7699b3db5a1f19d2c1a6e0d61c7b3f61b359bd..cc522a64e877459937541e5da23e241b023de79a 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -450,20 +450,20 @@ void LLAvatarListItem::initChildrenWidths(LLAvatarListItem* avatar_item)
//info btn width + padding
S32 info_btn_width = avatar_item->mProfileBtn->getRect().mLeft - avatar_item->mInfoBtn->getRect().mLeft;
- // edit their objects permission icon width + padding
- S32 permission_edit_theirs_width = avatar_item->mInfoBtn->getRect().mLeft - avatar_item->mIconPermissionEditTheirs->getRect().mLeft;
-
- // edit my objects permission icon width + padding
- S32 permission_edit_mine_width = avatar_item->mIconPermissionEditTheirs->getRect().mLeft - avatar_item->mIconPermissionEditMine->getRect().mLeft;
+ // online permission icon width + padding
+ S32 permission_online_width = avatar_item->mInfoBtn->getRect().mLeft - avatar_item->mIconPermissionOnline->getRect().mLeft;
// map permission icon width + padding
- S32 permission_map_width = avatar_item->mIconPermissionEditMine->getRect().mLeft - avatar_item->mIconPermissionMap->getRect().mLeft;
+ S32 permission_map_width = avatar_item->mIconPermissionOnline->getRect().mLeft - avatar_item->mIconPermissionMap->getRect().mLeft;
- // online permission icon width + padding
- S32 permission_online_width = avatar_item->mIconPermissionMap->getRect().mLeft - avatar_item->mIconPermissionOnline->getRect().mLeft;
+ // edit my objects permission icon width + padding
+ S32 permission_edit_mine_width = avatar_item->mIconPermissionMap->getRect().mLeft - avatar_item->mIconPermissionEditMine->getRect().mLeft;
+
+ // edit their objects permission icon width + padding
+ S32 permission_edit_theirs_width = avatar_item->mIconPermissionEditMine->getRect().mLeft - avatar_item->mIconPermissionEditTheirs->getRect().mLeft;
// last interaction time textbox width + padding
- S32 last_interaction_time_width = avatar_item->mIconPermissionOnline->getRect().mLeft - avatar_item->mLastInteractionTime->getRect().mLeft;
+ S32 last_interaction_time_width = avatar_item->mIconPermissionEditTheirs->getRect().mLeft - avatar_item->mLastInteractionTime->getRect().mLeft;
// avatar icon width + padding
S32 icon_width = avatar_item->mAvatarName->getRect().mLeft - avatar_item->mAvatarIcon->getRect().mLeft;
@@ -475,10 +475,10 @@ void LLAvatarListItem::initChildrenWidths(LLAvatarListItem* avatar_item)
sChildrenWidths[--index] = icon_width;
sChildrenWidths[--index] = 0; // for avatar name we don't need its width, it will be calculated as "left available space"
sChildrenWidths[--index] = last_interaction_time_width;
- sChildrenWidths[--index] = permission_online_width;
- sChildrenWidths[--index] = permission_map_width;
- sChildrenWidths[--index] = permission_edit_mine_width;
sChildrenWidths[--index] = permission_edit_theirs_width;
+ sChildrenWidths[--index] = permission_edit_mine_width;
+ sChildrenWidths[--index] = permission_map_width;
+ sChildrenWidths[--index] = permission_online_width;
sChildrenWidths[--index] = info_btn_width;
sChildrenWidths[--index] = profile_btn_width;
sChildrenWidths[--index] = speaking_indicator_width;
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index ffb988b2abd131c0155608f73e295f1c7d5eb465..52187284eb1d7ee3baa7118a08349d6bc8c2513d 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -143,10 +143,10 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver
ALIC_SPEAKER_INDICATOR,
ALIC_PROFILE_BUTTON,
ALIC_INFO_BUTTON,
- ALIC_PERMISSION_EDIT_THEIRS,
- ALIC_PERMISSION_EDIT_MINE,
- ALIC_PERMISSION_MAP,
ALIC_PERMISSION_ONLINE,
+ ALIC_PERMISSION_MAP,
+ ALIC_PERMISSION_EDIT_MINE,
+ ALIC_PERMISSION_EDIT_THEIRS,
ALIC_INTERACTION_TIME,
ALIC_NAME,
ALIC_ICON,
diff --git a/indra/newview/skins/default/textures/ff_edit_mine.tga b/indra/newview/skins/default/textures/ff_edit_mine.tga
deleted file mode 100644
index 8f0c35b98fafe79c785401dd11617bd113f84395..0000000000000000000000000000000000000000
Binary files a/indra/newview/skins/default/textures/ff_edit_mine.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_edit_mine_button.tga b/indra/newview/skins/default/textures/ff_edit_mine_button.tga
deleted file mode 100644
index 07627a65c5324d62dede19b26372595bb614f910..0000000000000000000000000000000000000000
Binary files a/indra/newview/skins/default/textures/ff_edit_mine_button.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_edit_theirs.tga b/indra/newview/skins/default/textures/ff_edit_theirs.tga
deleted file mode 100644
index 005ada2deaa121415d9115313ce1d03d456ee789..0000000000000000000000000000000000000000
Binary files a/indra/newview/skins/default/textures/ff_edit_theirs.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_edit_theirs_button.tga b/indra/newview/skins/default/textures/ff_edit_theirs_button.tga
deleted file mode 100644
index 798ef641d36954c2911df04035662a747f730732..0000000000000000000000000000000000000000
Binary files a/indra/newview/skins/default/textures/ff_edit_theirs_button.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_online_status_button.tga b/indra/newview/skins/default/textures/ff_online_status_button.tga
deleted file mode 100644
index 9076df6b9e82bb6147915a27eeff096c60594b39..0000000000000000000000000000000000000000
Binary files a/indra/newview/skins/default/textures/ff_online_status_button.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_visible_map.tga b/indra/newview/skins/default/textures/ff_visible_map.tga
deleted file mode 100644
index a4dad78dad145268a5db9afb68ad4f31c38f54b0..0000000000000000000000000000000000000000
Binary files a/indra/newview/skins/default/textures/ff_visible_map.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_visible_map_button.tga b/indra/newview/skins/default/textures/ff_visible_map_button.tga
deleted file mode 100644
index 8d13adee3f0f27a5ceb3fabc53861dd6610cedc6..0000000000000000000000000000000000000000
Binary files a/indra/newview/skins/default/textures/ff_visible_map_button.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_visible_online.tga b/indra/newview/skins/default/textures/ff_visible_online.tga
deleted file mode 100644
index 74e3a4e318faa0df3f26da33eed29bbf5a10f326..0000000000000000000000000000000000000000
Binary files a/indra/newview/skins/default/textures/ff_visible_online.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_visible_online_button.tga b/indra/newview/skins/default/textures/ff_visible_online_button.tga
deleted file mode 100644
index 08a6cbedd9b84c4ca567cd4a211ce4a2101c1c3f..0000000000000000000000000000000000000000
Binary files a/indra/newview/skins/default/textures/ff_visible_online_button.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/edit_mine.png b/indra/newview/skins/default/textures/icons/edit_mine.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0bc7efd255dbc817b342b922ddb5d3904df9ec8
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/edit_mine.png differ
diff --git a/indra/newview/skins/default/textures/icons/edit_theirs.png b/indra/newview/skins/default/textures/icons/edit_theirs.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed36ad7cfcec78f3d68bed969ea720e05d94ad1d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/edit_theirs.png differ
diff --git a/indra/newview/skins/default/textures/icons/see_me_online.png b/indra/newview/skins/default/textures/icons/see_me_online.png
new file mode 100644
index 0000000000000000000000000000000000000000..52dc2ae74f5f8b10216d31e7c67a577a6207d941
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/see_me_online.png differ
diff --git a/indra/newview/skins/default/textures/icons/see_on_map.png b/indra/newview/skins/default/textures/icons/see_on_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..200e64981883774fc8a59c8c7cc0cafbc9b8489a
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/see_on_map.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 273531f9b291e422a9ae4b7a025dcfa08b5abbb5..fff118d69ae2afa405aed382bf32b47a7ab92972 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -360,10 +360,10 @@ with the same filename but different name
<texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" />
<texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" />
- <texture name="Permission_Visible_Online" file_name="ff_visible_online_button.tga" preload="false" />
- <texture name="Permission_Visible_Map" file_name="ff_visible_map_button.tga" preload="false" />
- <texture name="Permission_Edit_Objects_Mine" file_name="ff_edit_mine_button.tga" preload="false" />
- <texture name="Permission_Edit_Objects_Theirs" file_name="ff_edit_theirs_button.tga" preload="false" />
+ <texture name="Permission_Visible_Online" file_name="icons/see_me_online.png" preload="false" />
+ <texture name="Permission_Visible_Map" file_name="icons/see_on_map.png" preload="false" />
+ <texture name="Permission_Edit_Objects_Mine" file_name="icons/edit_mine.png" preload="false" />
+ <texture name="Permission_Edit_Objects_Theirs" file_name="icons/edit_theirs.png" preload="false" />
<texture name="Play_Off" file_name="icons/Play_Off.png" preload="false" />
<texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" />
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 b385654010e2d7be9107ac5276964d151f52d2c6..6f3629cc8fc2a7521847597c8dfdb2fc3d8410fc 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
@@ -19,6 +19,11 @@
<string name="FormatMonths">[COUNT]mon</string>
<string name="FormatYears">[COUNT]y</string>
+ <!--
+ *NOTE: llavatarlistitem.cpp lays these controls out depending on which
+ ones are visible. Trying to change their order here will break it
+ ... which kinda sucks.
+ -->
<icon
follows="top|right|left"
height="24"
@@ -71,49 +76,49 @@
value="0s"
width="35" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Visible_Online"
+ image_name="Permission_Edit_Objects_Theirs"
layout="topleft"
left_pad="3"
- right="-141"
- name="permission_online_icon"
- tool_tip="This friend can see when you're online"
- top="2"
- width="20" />
+ right="-129"
+ name="permission_edit_theirs_icon"
+ tool_tip="You can edit this friend's objects"
+ top="4"
+ width="16" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Visible_Map"
+ image_name="Permission_Edit_Objects_Mine"
layout="topleft"
left_pad="3"
- tool_tip="This friend can locate you on the map"
- right="-118"
- name="permission_map_icon"
+ right="-110"
+ name="permission_edit_mine_icon"
+ tool_tip="This friend can edit, delete or take your objects"
top_delta="0"
- width="20" />
+ width="16" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Edit_Objects_Mine"
+ image_name="Permission_Visible_Map"
layout="topleft"
left_pad="3"
- right="-95"
- name="permission_edit_mine_icon"
- tool_tip="This friend can edit, delete or take your objects"
+ tool_tip="This friend can locate you on the map"
+ right="-91"
+ name="permission_map_icon"
top_delta="0"
- width="20" />
+ width="16" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Edit_Objects_Theirs"
+ image_name="Permission_Visible_Online"
layout="topleft"
left_pad="3"
right="-72"
- name="permission_edit_theirs_icon"
- tool_tip="You can edit this friend's objects"
+ name="permission_online_icon"
+ tool_tip="This friend can see when you're online"
top_delta="0"
- width="20" />
+ width="16" />
<button
follows="right"
height="16"
@@ -124,7 +129,7 @@
right="-53"
name="info_btn"
tab_stop="false"
- top_delta="2"
+ top_delta="0"
width="16" />
<button
follows="right"