diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-09-23 13:17:58 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-09-23 13:17:58 +0100 |
| commit | 93eb6cac2d89b1f9b3aabb982d6396759fd58bb7 (patch) | |
| tree | f9ffaa423b0a293c9d2c969a1dab10b92ecac7fd | |
| parent | 45cebd19dd365dc1d921d06a33864872b682f448 (diff) | |
STORM-128 SUPPLEMENTARY Move new permissions icons into the icons directory.
(transplanted from f71072a1532b3fa3de98197dd0ceeb3071ac6856)
| -rw-r--r-- | indra/newview/skins/default/textures/icons/edit_mine.png (renamed from indra/newview/skins/default/textures/edit_mine.png) | bin | 639 -> 639 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/edit_theirs.png (renamed from indra/newview/skins/default/textures/edit_theirs.png) | bin | 634 -> 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) | bin | 330 -> 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) | bin | 613 -> 613 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 8 |
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 Binary files differindex a0bc7efd25..a0bc7efd25 100644 --- a/indra/newview/skins/default/textures/edit_mine.png +++ b/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 Binary files differindex ed36ad7cfc..ed36ad7cfc 100644 --- a/indra/newview/skins/default/textures/edit_theirs.png +++ b/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 Binary files differindex 52dc2ae74f..52dc2ae74f 100644 --- a/indra/newview/skins/default/textures/see_me_online.png +++ b/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 Binary files differindex 200e649818..200e649818 100644 --- a/indra/newview/skins/default/textures/see_on_map.png +++ b/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 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" /> |
