diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-10 15:26:04 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-10 15:26:04 +0200 |
| commit | 2d1c1cbf3afed9b7a54de86f61a1a2d2ac3beba1 (patch) | |
| tree | 97275b832beb3a0bc149a0728cb9e244e5a2f956 /indra/newview/skins/default/textures | |
| parent | efee637e3bf1a13591d83e6cbf52acc483a6e61a (diff) | |
| parent | 5831cb1394338cdfc45e3188a034edb54c2b785f (diff) | |
Merge
--HG--
branch : product-engine
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 309c2a5f30..18d1779702 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -515,6 +515,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" /> |
