diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 14:51:39 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 14:51:39 +0000 |
| commit | 56d43b9c79ede83c563c4d6d1f60ea831926e1ac (patch) | |
| tree | 9ae0595dfdbbd4ff22a93f2e48ad49e1060ca802 /indra/newview/skins/default/textures | |
| parent | a4ef5e2b0d4e36aa98f2e4074f4ddd4cad3d3106 (diff) | |
| parent | 15825cb8992ce692172907714c7cd64a48ed5fa4 (diff) | |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/object_icon.png | bin | 0 -> 410 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/object_icon.png b/indra/newview/skins/default/textures/icons/object_icon.png Binary files differnew file mode 100644 index 0000000000..223874e631 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/object_icon.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index b8131b2de9..7a2e40551c 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -516,6 +516,7 @@ with the same filename but different name <texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.png" /> <texture name="SL_Logo" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="OBJECT_Icon" file_name="icons/object_icon.png" preload="true" /> <texture name="Snapshot_Off" file_name="bottomtray/Snapshot_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> <texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" /> |
