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: [PATCH] STORM-128 SUPPLEMENTARY Move new permissions icons into the
 icons directory. (transplanted from f71072a1532b3fa3de98197dd0ceeb3071ac6856)

---
 .../default/textures/{ => icons}/edit_mine.png      | Bin
 .../default/textures/{ => icons}/edit_theirs.png    | Bin
 .../default/textures/{ => icons}/see_me_online.png  | Bin
 .../default/textures/{ => icons}/see_on_map.png     | Bin
 indra/newview/skins/default/textures/textures.xml   |   8 ++++----
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename indra/newview/skins/default/textures/{ => icons}/edit_mine.png (100%)
 rename indra/newview/skins/default/textures/{ => icons}/edit_theirs.png (100%)
 rename indra/newview/skins/default/textures/{ => icons}/see_me_online.png (100%)
 rename indra/newview/skins/default/textures/{ => icons}/see_on_map.png (100%)

diff --git a/indra/newview/skins/default/textures/edit_mine.png b/indra/newview/skins/default/textures/icons/edit_mine.png
similarity index 100%
rename from indra/newview/skins/default/textures/edit_mine.png
rename to indra/newview/skins/default/textures/icons/edit_mine.png
diff --git a/indra/newview/skins/default/textures/edit_theirs.png b/indra/newview/skins/default/textures/icons/edit_theirs.png
similarity index 100%
rename from indra/newview/skins/default/textures/edit_theirs.png
rename to indra/newview/skins/default/textures/icons/edit_theirs.png
diff --git a/indra/newview/skins/default/textures/see_me_online.png b/indra/newview/skins/default/textures/icons/see_me_online.png
similarity index 100%
rename from indra/newview/skins/default/textures/see_me_online.png
rename to indra/newview/skins/default/textures/icons/see_me_online.png
diff --git a/indra/newview/skins/default/textures/see_on_map.png b/indra/newview/skins/default/textures/icons/see_on_map.png
similarity index 100%
rename from indra/newview/skins/default/textures/see_on_map.png
rename to indra/newview/skins/default/textures/icons/see_on_map.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 2776c072022..fff118d69ae 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" />
-- 
GitLab