diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-09-08 17:58:17 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-09-08 17:58:17 -0400 |
commit | eed7b7201188e01a452c7f4c511c0cb157dc7a5f (patch) | |
tree | e705e93230361aee2c1573f6c37d5d53abda42a0 /indra/newview/skins/default/textures | |
parent | a2fb3fabc7926dd105393391f334baa78f232640 (diff) | |
parent | 45639aa0d1889a6cbd9223e987740d25d96ed8fd (diff) |
automated merge
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 ce67cf0083..16798aa2b1 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -223,6 +223,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" /> |