summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-09-23 12:13:43 +0100
committerAimee Linden <aimee@lindenlab.com>2010-09-23 12:13:43 +0100
commit8e67a60528718541e9104cee29759b71bdb4d2d6 (patch)
treead5d95b168ef7fd34425e9d25bdf641ac1f2b08a /indra/newview/skins/default/textures
parent264b549bcb991f4cdd6889f06b8f7fbe8740e32a (diff)
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.
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r--indra/newview/skins/default/textures/edit_mine.pngbin0 -> 639 bytes
-rw-r--r--indra/newview/skins/default/textures/edit_theirs.pngbin0 -> 634 bytes
-rw-r--r--indra/newview/skins/default/textures/ff_edit_mine.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/ff_edit_mine_button.tgabin4140 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/ff_edit_theirs.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/ff_edit_theirs_button.tgabin4140 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/ff_online_status_button.tgabin4140 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/ff_visible_map.tgabin812 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/ff_visible_map_button.tgabin4140 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/ff_visible_online.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/ff_visible_online_button.tgabin4140 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/see_me_online.pngbin0 -> 330 bytes
-rw-r--r--indra/newview/skins/default/textures/see_on_map.pngbin0 -> 613 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml8
14 files changed, 4 insertions, 4 deletions
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
--- /dev/null
+++ b/indra/newview/skins/default/textures/edit_mine.png
Binary files 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
--- /dev/null
+++ b/indra/newview/skins/default/textures/edit_theirs.png
Binary files 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
--- a/indra/newview/skins/default/textures/ff_edit_mine.tga
+++ /dev/null
Binary files 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
--- a/indra/newview/skins/default/textures/ff_edit_mine_button.tga
+++ /dev/null
Binary files 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
--- a/indra/newview/skins/default/textures/ff_edit_theirs.tga
+++ /dev/null
Binary files 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
--- a/indra/newview/skins/default/textures/ff_edit_theirs_button.tga
+++ /dev/null
Binary files 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
--- a/indra/newview/skins/default/textures/ff_online_status_button.tga
+++ /dev/null
Binary files 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
--- a/indra/newview/skins/default/textures/ff_visible_map.tga
+++ /dev/null
Binary files 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
--- a/indra/newview/skins/default/textures/ff_visible_map_button.tga
+++ /dev/null
Binary files 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
--- a/indra/newview/skins/default/textures/ff_visible_online.tga
+++ /dev/null
Binary files 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
--- a/indra/newview/skins/default/textures/ff_visible_online_button.tga
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/indra/newview/skins/default/textures/see_me_online.png
Binary files 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
--- /dev/null
+++ b/indra/newview/skins/default/textures/see_on_map.png
Binary files 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
<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="see_me_online.png" preload="false" />
+ <texture name="Permission_Visible_Map" file_name="see_on_map.png" preload="false" />
+ <texture name="Permission_Edit_Objects_Mine" file_name="edit_mine.png" preload="false" />
+ <texture name="Permission_Edit_Objects_Theirs" file_name="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" />