diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-03 09:37:03 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-03 09:37:03 -0400 |
commit | b8e97adced58f81a52e6b76a14309d275d55c8bc (patch) | |
tree | 9f2710cbb13093c509896f184a025ab7469c934c /indra/newview/skins/default/textures/textures.xml | |
parent | abc259618f06f69ba8e7c72cb149bcddc1bb6ddf (diff) | |
parent | e58c809a5816383674d0f1957440fad728e88893 (diff) |
merge changes for OPEN-39
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index cec2942b35..1ca48b01a8 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -226,6 +226,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" /> @@ -673,4 +674,5 @@ with the same filename but different name <texture name="Yellow_Gradient" file_name="windows/yellow_gradient.png"/> <texture name="Popup_Caution" file_name="icons/pop_up_caution.png"/> + <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/> </textures> |