diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-14 22:59:36 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 22:59:36 -0500 |
commit | ad991346683c9e69d3e86b0e98275cb3fa47fb72 (patch) | |
tree | 371029c497c6453734771abc0eebb8755b841ad8 /indra/newview/skins/default/textures | |
parent | 2027ce56a217b97848f5582a14f8ed81593a1f54 (diff) | |
parent | efa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (diff) |
Automated merge with file:///Users/oz/Work/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 a51a096482..235dcc4b32 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -224,6 +224,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" /> |