From 93eb6cac2d89b1f9b3aabb982d6396759fd58bb7 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 23 Sep 2010 13:17:58 +0100
Subject: STORM-128 SUPPLEMENTARY Move new permissions icons into the icons
 directory. (transplanted from f71072a1532b3fa3de98197dd0ceeb3071ac6856)

---
 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')

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
   <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="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="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" />
-- 
cgit v1.2.3