From 8e67a60528718541e9104cee29759b71bdb4d2d6 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 23 Sep 2010 12:13:43 +0100 Subject: STORM-128 FIXED New friends list permission icons * Added new icon artwork. * Reordered the icons so that the most common ones are to the right, so that they change position as little as possible. * Removed old 1.23 icons. --- indra/newview/skins/default/textures/edit_mine.png | Bin 0 -> 639 bytes indra/newview/skins/default/textures/edit_theirs.png | Bin 0 -> 634 bytes indra/newview/skins/default/textures/ff_edit_mine.tga | Bin 1068 -> 0 bytes .../skins/default/textures/ff_edit_mine_button.tga | Bin 4140 -> 0 bytes indra/newview/skins/default/textures/ff_edit_theirs.tga | Bin 1068 -> 0 bytes .../skins/default/textures/ff_edit_theirs_button.tga | Bin 4140 -> 0 bytes .../skins/default/textures/ff_online_status_button.tga | Bin 4140 -> 0 bytes indra/newview/skins/default/textures/ff_visible_map.tga | Bin 812 -> 0 bytes .../skins/default/textures/ff_visible_map_button.tga | Bin 4140 -> 0 bytes .../newview/skins/default/textures/ff_visible_online.tga | Bin 1068 -> 0 bytes .../skins/default/textures/ff_visible_online_button.tga | Bin 4140 -> 0 bytes indra/newview/skins/default/textures/see_me_online.png | Bin 0 -> 330 bytes indra/newview/skins/default/textures/see_on_map.png | Bin 0 -> 613 bytes indra/newview/skins/default/textures/textures.xml | 8 ++++---- 14 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 indra/newview/skins/default/textures/edit_mine.png create mode 100644 indra/newview/skins/default/textures/edit_theirs.png delete mode 100644 indra/newview/skins/default/textures/ff_edit_mine.tga delete mode 100644 indra/newview/skins/default/textures/ff_edit_mine_button.tga delete mode 100644 indra/newview/skins/default/textures/ff_edit_theirs.tga delete mode 100644 indra/newview/skins/default/textures/ff_edit_theirs_button.tga delete mode 100644 indra/newview/skins/default/textures/ff_online_status_button.tga delete mode 100644 indra/newview/skins/default/textures/ff_visible_map.tga delete mode 100644 indra/newview/skins/default/textures/ff_visible_map_button.tga delete mode 100644 indra/newview/skins/default/textures/ff_visible_online.tga delete mode 100644 indra/newview/skins/default/textures/ff_visible_online_button.tga create mode 100644 indra/newview/skins/default/textures/see_me_online.png create mode 100644 indra/newview/skins/default/textures/see_on_map.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/edit_mine.png b/indra/newview/skins/default/textures/edit_mine.png new file mode 100644 index 0000000000..a0bc7efd25 Binary files /dev/null and b/indra/newview/skins/default/textures/edit_mine.png differ diff --git a/indra/newview/skins/default/textures/edit_theirs.png b/indra/newview/skins/default/textures/edit_theirs.png new file mode 100644 index 0000000000..ed36ad7cfc Binary files /dev/null and b/indra/newview/skins/default/textures/edit_theirs.png differ 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 8f0c35b98f..0000000000 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 07627a65c5..0000000000 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 005ada2dea..0000000000 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 798ef641d3..0000000000 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 9076df6b9e..0000000000 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 a4dad78dad..0000000000 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 8d13adee3f..0000000000 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 74e3a4e318..0000000000 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 08a6cbedd9..0000000000 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/see_me_online.png b/indra/newview/skins/default/textures/see_me_online.png new file mode 100644 index 0000000000..52dc2ae74f Binary files /dev/null and b/indra/newview/skins/default/textures/see_me_online.png differ diff --git a/indra/newview/skins/default/textures/see_on_map.png b/indra/newview/skins/default/textures/see_on_map.png new file mode 100644 index 0000000000..200e649818 Binary files /dev/null and b/indra/newview/skins/default/textures/see_on_map.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 273531f9b2..2776c07202 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 - - - - + + + + -- cgit v1.2.3 From 7f0bcfae49169f1c76806cf857a920a6a2396bf9 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 23 Sep 2010 13:17:58 +0100 Subject: STORM-128 SUPPLEMENTARY Move new permissions icons into the icons directory. --- indra/newview/skins/default/textures/edit_mine.png | Bin 639 -> 0 bytes indra/newview/skins/default/textures/edit_theirs.png | Bin 634 -> 0 bytes indra/newview/skins/default/textures/icons/edit_mine.png | Bin 0 -> 639 bytes .../newview/skins/default/textures/icons/edit_theirs.png | Bin 0 -> 634 bytes .../skins/default/textures/icons/see_me_online.png | Bin 0 -> 330 bytes indra/newview/skins/default/textures/icons/see_on_map.png | Bin 0 -> 613 bytes indra/newview/skins/default/textures/see_me_online.png | Bin 330 -> 0 bytes indra/newview/skins/default/textures/see_on_map.png | Bin 613 -> 0 bytes indra/newview/skins/default/textures/textures.xml | 8 ++++---- 9 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 indra/newview/skins/default/textures/edit_mine.png delete mode 100644 indra/newview/skins/default/textures/edit_theirs.png create mode 100644 indra/newview/skins/default/textures/icons/edit_mine.png create mode 100644 indra/newview/skins/default/textures/icons/edit_theirs.png create mode 100644 indra/newview/skins/default/textures/icons/see_me_online.png create mode 100644 indra/newview/skins/default/textures/icons/see_on_map.png delete mode 100644 indra/newview/skins/default/textures/see_me_online.png delete mode 100644 indra/newview/skins/default/textures/see_on_map.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/edit_mine.png b/indra/newview/skins/default/textures/edit_mine.png deleted file mode 100644 index a0bc7efd25..0000000000 Binary files a/indra/newview/skins/default/textures/edit_mine.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/edit_theirs.png b/indra/newview/skins/default/textures/edit_theirs.png deleted file mode 100644 index ed36ad7cfc..0000000000 Binary files a/indra/newview/skins/default/textures/edit_theirs.png 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 0000000000..a0bc7efd25 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 0000000000..ed36ad7cfc 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 0000000000..52dc2ae74f 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 0000000000..200e649818 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/see_me_online.png b/indra/newview/skins/default/textures/see_me_online.png deleted file mode 100644 index 52dc2ae74f..0000000000 Binary files a/indra/newview/skins/default/textures/see_me_online.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/see_on_map.png b/indra/newview/skins/default/textures/see_on_map.png deleted file mode 100644 index 200e649818..0000000000 Binary files a/indra/newview/skins/default/textures/see_on_map.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 2776c07202..fff118d69a 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 - - - - + + + + -- cgit v1.2.3