diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-13 11:14:13 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-13 11:14:13 -0500 |
commit | b01ca1293b7890ee1e2671f4a9e7b1a77a559a44 (patch) | |
tree | 45316409d91dd5cb72e31ae9b53154469380cb99 /indra/newview/skins/default/textures | |
parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) | |
parent | 433ad05ae9580027641c8bd5e1fe175f96669a66 (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 2c00120177..c539ae6ed0 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" /> |