From dcbdb1fee553dd3877447b659e35e158fabc0c47 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 22 Jul 2010 17:35:35 +0100 Subject: EXT-1579 FIXED Show icons representing permissions granted in friends list on roll-over. Needs new icon artwork, currently reusing old 1.23 icons. --- indra/newview/skins/default/textures/textures.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 082b37d80b..d2478a8ca5 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -358,11 +358,16 @@ with the same filename but different name + + + + + + - -- cgit v1.2.3 From be50a053ed4ae7d0b15fc20f1c6ca0973c56ffd9 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Thu, 12 Aug 2010 09:46:45 -0700 Subject: first pass at hints --- indra/newview/skins/default/textures/textures.xml | 8 +++++++- .../skins/default/textures/windows/hint_arrow_down.png | Bin 0 -> 3239 bytes .../skins/default/textures/windows/hint_arrow_left.png | Bin 0 -> 3163 bytes .../skins/default/textures/windows/hint_arrow_right.png | Bin 0 -> 3155 bytes .../skins/default/textures/windows/hint_arrow_up.png | Bin 0 -> 3248 bytes .../skins/default/textures/windows/hint_background.png | Bin 0 -> 3930 bytes 6 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/windows/hint_arrow_down.png create mode 100644 indra/newview/skins/default/textures/windows/hint_arrow_left.png create mode 100644 indra/newview/skins/default/textures/windows/hint_arrow_right.png create mode 100644 indra/newview/skins/default/textures/windows/hint_arrow_up.png create mode 100644 indra/newview/skins/default/textures/windows/hint_background.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 082b37d80b..9fbbfb1d2b 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -645,5 +645,11 @@ with the same filename but different name - + + + + + + + diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_down.png b/indra/newview/skins/default/textures/windows/hint_arrow_down.png new file mode 100644 index 0000000000..11ab3c2d0c Binary files /dev/null and b/indra/newview/skins/default/textures/windows/hint_arrow_down.png differ diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_left.png b/indra/newview/skins/default/textures/windows/hint_arrow_left.png new file mode 100644 index 0000000000..e5c597a550 Binary files /dev/null and b/indra/newview/skins/default/textures/windows/hint_arrow_left.png differ diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_right.png b/indra/newview/skins/default/textures/windows/hint_arrow_right.png new file mode 100644 index 0000000000..3f89187e13 Binary files /dev/null and b/indra/newview/skins/default/textures/windows/hint_arrow_right.png differ diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_up.png b/indra/newview/skins/default/textures/windows/hint_arrow_up.png new file mode 100644 index 0000000000..1050097efb Binary files /dev/null and b/indra/newview/skins/default/textures/windows/hint_arrow_up.png differ diff --git a/indra/newview/skins/default/textures/windows/hint_background.png b/indra/newview/skins/default/textures/windows/hint_background.png new file mode 100644 index 0000000000..0839a95205 Binary files /dev/null and b/indra/newview/skins/default/textures/windows/hint_background.png differ -- cgit v1.2.3 From c1e71b0ee1f43486b79bf34305d5212afd8541a9 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 26 Aug 2010 12:32:14 -0700 Subject: added images for popup notification --- .../skins/default/textures/icons/pop_up_caution.png | Bin 0 -> 3158 bytes indra/newview/skins/default/textures/textures.xml | 2 ++ .../skins/default/textures/windows/yellow_gradient.png | Bin 0 -> 3634 bytes 3 files changed, 2 insertions(+) create mode 100644 indra/newview/skins/default/textures/icons/pop_up_caution.png create mode 100644 indra/newview/skins/default/textures/windows/yellow_gradient.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/pop_up_caution.png b/indra/newview/skins/default/textures/icons/pop_up_caution.png new file mode 100644 index 0000000000..78b681cb33 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/pop_up_caution.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 9fbbfb1d2b..8d6a564687 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -652,4 +652,6 @@ with the same filename but different name + + diff --git a/indra/newview/skins/default/textures/windows/yellow_gradient.png b/indra/newview/skins/default/textures/windows/yellow_gradient.png new file mode 100644 index 0000000000..5fd847aaef Binary files /dev/null and b/indra/newview/skins/default/textures/windows/yellow_gradient.png differ -- cgit v1.2.3 From 8ff7cfa4f2adf9a77ddf31b75ea7d147d0ee3c0b Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 30 Aug 2010 14:01:11 -0400 Subject: EXT-8771 Avatar Physics causes crash on login with release viewer Added backwards compatibility support for new wearable types. --- .../newview/skins/default/textures/icons/Inv_Invalid.png | Bin 0 -> 329 bytes indra/newview/skins/default/textures/textures.xml | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/icons/Inv_Invalid.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Inv_Invalid.png b/indra/newview/skins/default/textures/icons/Inv_Invalid.png new file mode 100644 index 0000000000..328be104ee Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Invalid.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 082b37d80b..fa09a41a1d 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -229,7 +229,8 @@ with the same filename but different name - + + -- cgit v1.2.3 From 94af8b77df5fd63cb30ee676a313897b90841672 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Mon, 6 Sep 2010 17:33:48 +0300 Subject: VWR-20696 ADDITIONAL FIX Added and made use of new dock/undock icons. --- .../textures/taskpanel/Sidebar_Icon_Dock_Foreground.png | Bin 0 -> 2899 bytes .../textures/taskpanel/Sidebar_Icon_Dock_Press.png | Bin 0 -> 2886 bytes .../taskpanel/Sidebar_Icon_Undock_Foreground.png | Bin 0 -> 2896 bytes .../textures/taskpanel/Sidebar_Icon_Undock_Press.png | Bin 0 -> 2920 bytes indra/newview/skins/default/textures/textures.xml | 6 ++++++ 5 files changed, 6 insertions(+) create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png new file mode 100644 index 0000000000..50c01062a5 Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png differ diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png new file mode 100644 index 0000000000..bf2065cd37 Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png differ diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png new file mode 100644 index 0000000000..8b48258142 Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png differ diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png new file mode 100644 index 0000000000..09efe779fe Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 082b37d80b..ce67cf0083 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -428,6 +428,12 @@ with the same filename but different name + + + + + + -- cgit v1.2.3 From d8b76f6c7fb65a5ba4ff9f12af93c1cf5e405347 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Fri, 10 Sep 2010 19:24:24 +0300 Subject: STORM-98 FIXED Updated art for People and Groups default/placeholder icons. Replaced the old icons with the ones provided by Epic. --- .../default/textures/icons/Generic_Group_Large.png | Bin 7061 -> 7507 bytes .../default/textures/icons/Generic_Person_Large.png | Bin 1630 -> 51508 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png index de8a39fc8a..75833eccf3 100644 Binary files a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png and b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png differ diff --git a/indra/newview/skins/default/textures/icons/Generic_Person_Large.png b/indra/newview/skins/default/textures/icons/Generic_Person_Large.png index 65b0ce8b67..532288b430 100644 Binary files a/indra/newview/skins/default/textures/icons/Generic_Person_Large.png and b/indra/newview/skins/default/textures/icons/Generic_Person_Large.png differ -- cgit v1.2.3 From db538aa945c5b977fcdc294f7946870cdc8b5d30 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Fri, 10 Sep 2010 17:02:47 -0700 Subject: EXP-22 FIX Change hints background to white --- .../default/textures/windows/hint_arrow_down.png | Bin 3239 -> 3170 bytes .../default/textures/windows/hint_arrow_left.png | Bin 3163 -> 3059 bytes .../default/textures/windows/hint_arrow_right.png | Bin 3155 -> 3112 bytes .../skins/default/textures/windows/hint_arrow_up.png | Bin 3248 -> 3219 bytes .../default/textures/windows/hint_background.png | Bin 3930 -> 4316 bytes 5 files changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_down.png b/indra/newview/skins/default/textures/windows/hint_arrow_down.png index 11ab3c2d0c..ddadef0978 100644 Binary files a/indra/newview/skins/default/textures/windows/hint_arrow_down.png and b/indra/newview/skins/default/textures/windows/hint_arrow_down.png differ diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_left.png b/indra/newview/skins/default/textures/windows/hint_arrow_left.png index e5c597a550..2794b967e8 100644 Binary files a/indra/newview/skins/default/textures/windows/hint_arrow_left.png and b/indra/newview/skins/default/textures/windows/hint_arrow_left.png differ diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_right.png b/indra/newview/skins/default/textures/windows/hint_arrow_right.png index 3f89187e13..7ac57f805b 100644 Binary files a/indra/newview/skins/default/textures/windows/hint_arrow_right.png and b/indra/newview/skins/default/textures/windows/hint_arrow_right.png differ diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_up.png b/indra/newview/skins/default/textures/windows/hint_arrow_up.png index 1050097efb..bb3e1c07fa 100644 Binary files a/indra/newview/skins/default/textures/windows/hint_arrow_up.png and b/indra/newview/skins/default/textures/windows/hint_arrow_up.png differ diff --git a/indra/newview/skins/default/textures/windows/hint_background.png b/indra/newview/skins/default/textures/windows/hint_background.png index 0839a95205..cfac5deacb 100644 Binary files a/indra/newview/skins/default/textures/windows/hint_background.png and b/indra/newview/skins/default/textures/windows/hint_background.png differ -- cgit v1.2.3 From fbcde287363f38a4f73a14bbf3501e34b9698c68 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Fri, 10 Sep 2010 18:06:42 -0700 Subject: EXP-23 FIX Tail for chat box hint should be slantways instead of horizontal --- indra/newview/skins/default/textures/textures.xml | 1 + .../default/textures/windows/hint_arrow_lower_left.png | Bin 0 -> 3081 bytes 2 files changed, 1 insertion(+) create mode 100644 indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 8d6a564687..7c8574609c 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -651,6 +651,7 @@ with the same filename but different name + diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png b/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png new file mode 100644 index 0000000000..0dfc99898d Binary files /dev/null and b/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png differ -- cgit v1.2.3 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 From 35c81f75ac9c134052debb21f6467012859a1fc6 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 24 Sep 2010 23:52:32 -0500 Subject: Fix for bad zipping of meshes and add mesh icon back to repository. --- indra/newview/skins/default/textures/icons/Inv_Mesh.png | Bin 0 -> 3263 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Inv_Mesh.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Inv_Mesh.png b/indra/newview/skins/default/textures/icons/Inv_Mesh.png new file mode 100644 index 0000000000..f1f21f7941 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Mesh.png differ -- cgit v1.2.3