summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-09-23 13:17:58 +0100
committerAimee Linden <aimee@lindenlab.com>2010-09-23 13:17:58 +0100
commit7f0bcfae49169f1c76806cf857a920a6a2396bf9 (patch)
treef95389e5c7f2cef2ef8ea53b5acc8f226e63e613 /indra/newview
parent8e67a60528718541e9104cee29759b71bdb4d2d6 (diff)
STORM-128 SUPPLEMENTARY Move new permissions icons into the icons directory.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/textures/icons/edit_mine.png (renamed from indra/newview/skins/default/textures/edit_mine.png)bin639 -> 639 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/edit_theirs.png (renamed from indra/newview/skins/default/textures/edit_theirs.png)bin634 -> 634 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/see_me_online.png (renamed from indra/newview/skins/default/textures/see_me_online.png)bin330 -> 330 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/see_on_map.png (renamed from indra/newview/skins/default/textures/see_on_map.png)bin613 -> 613 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml8
5 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/textures/edit_mine.png b/indra/newview/skins/default/textures/icons/edit_mine.png
index a0bc7efd25..a0bc7efd25 100644
--- a/indra/newview/skins/default/textures/edit_mine.png
+++ b/indra/newview/skins/default/textures/icons/edit_mine.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/edit_theirs.png b/indra/newview/skins/default/textures/icons/edit_theirs.png
index ed36ad7cfc..ed36ad7cfc 100644
--- a/indra/newview/skins/default/textures/edit_theirs.png
+++ b/indra/newview/skins/default/textures/icons/edit_theirs.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/see_me_online.png b/indra/newview/skins/default/textures/icons/see_me_online.png
index 52dc2ae74f..52dc2ae74f 100644
--- a/indra/newview/skins/default/textures/see_me_online.png
+++ b/indra/newview/skins/default/textures/icons/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/icons/see_on_map.png
index 200e649818..200e649818 100644
--- a/indra/newview/skins/default/textures/see_on_map.png
+++ b/indra/newview/skins/default/textures/icons/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 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" />