diff options
author | Oz Linden <oz@lindenlab.com> | 2011-02-08 11:57:38 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-02-08 11:57:38 -0500 |
commit | 634f152004f4b3938239ec2494030079f695b8ab (patch) | |
tree | d59e9b3e37c93c141829aec44bf4da4e59d7ad10 /indra/newview/skins/default/textures | |
parent | 09b009fc23e75c8403cc9879f7f839d9e2656c02 (diff) | |
parent | 99d4f573517085ac602514672eab8a45dc002823 (diff) |
merge up to latest 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 7b3cc7bdfa..4d7cddce07 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -225,6 +225,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" /> |