diff options
| author | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-11-11 17:18:38 -0500 |
|---|---|---|
| committer | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-11-11 17:18:38 -0500 |
| commit | f59fce85824ae8de6d89f1e8ff4d7c9a6806cae6 (patch) | |
| tree | 4c5947844df0617ee10ba7886fd1b039cca6bc98 | |
| parent | bc5096ff3d01f25cd47c9a5803f3255e11cd8cfa (diff) | |
| parent | 20c9b13df6d069814217525ec1cea0782a391c7f (diff) | |
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/widgets/Tooltip.png | bin | 0 -> 2910 bytes |
2 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 e881665578..57239f9e7f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -531,6 +531,8 @@ <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="false" /> <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" /> <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" /> + + <texture name="Tooltip" file_name="widgets/Tooltip.png" preload="true" scale.left="2" scale.top="1" scale.right="99" scale.bottom="14" <texture name="TrashItem_Disabled" file_name="icons/TrashItem_Disabled.png" preload="false" /> <texture name="TrashItem_Off" file_name="icons/TrashItem_Off.png" preload="false" /> diff --git a/indra/newview/skins/default/textures/widgets/Tooltip.png b/indra/newview/skins/default/textures/widgets/Tooltip.png Binary files differnew file mode 100644 index 0000000000..f989ac9083 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Tooltip.png |
