diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-01 17:39:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 17:39:08 -0400 |
commit | 1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (patch) | |
tree | 9a51b54cd3a500e066c25e2c6180dd343ec639d9 /indra/newview/skins/default/textures | |
parent | 2deea7c9d162b9bcae29e73fca8eebd26460fbf8 (diff) | |
parent | f12d79907c7f002666291ab23dbb01ba715fa2c1 (diff) |
merge out end-of-develop.py tag from viewer-development
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_Physics.png | bin | 0 -> 616 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/Inv_Physics.png b/indra/newview/skins/default/textures/icons/Inv_Physics.png Binary files differnew file mode 100644 index 0000000000..ddd36b446b --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Physics.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index d79d660724..1ca48b01a8 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -226,6 +226,7 @@ with the same filename but different name <texture name="Inv_SysClosed" file_name="icons/Inv_SysClosed.png" preload="false" /> <texture name="Inv_SysOpen" file_name="icons/Inv_SysOpen.png" preload="false" /> <texture name="Inv_Tattoo" file_name="icons/Inv_Tattoo.png" preload="false" /> + <texture name="Inv_Physics" file_name="icons/Inv_Physics.png" preload="false" /> <texture name="Inv_Texture" file_name="icons/Inv_Texture.png" preload="false" /> <texture name="Inv_TrashClosed" file_name="icons/Inv_TrashClosed.png" preload="false" /> <texture name="Inv_TrashOpen" file_name="icons/Inv_TrashOpen.png" preload="false" /> |