summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-19 07:34:35 -0500
committerOz Linden <oz@lindenlab.com>2011-02-19 07:34:35 -0500
commit19e99a5c09274049d00f25b2d88ee6429747b084 (patch)
treedd0bce45605b1f740dfe210738dda98dc87e7455 /indra/newview/skins/default/textures
parent1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff)
parent634f152004f4b3938239ec2494030079f695b8ab (diff)
Automated merge with file:///Users/oz/Work/V-D
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r--indra/newview/skins/default/textures/icons/Inv_Physics.pngbin0 -> 616 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml1
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
new file mode 100644
index 0000000000..ddd36b446b
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_Physics.png
Binary files differ
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" />