diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-25 11:26:08 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-25 11:26:08 -0700 |
commit | e5ca2b4b82704d11172e0c32761138ec0f58fbe3 (patch) | |
tree | 5875b249bf68502e9e75fac24d9510496c0c9baf /indra/newview/skins/default/textures | |
parent | f8907b327bb0009047b9cef54fde3d7dc6e8d6ca (diff) | |
parent | 33e4a2c7b1ab3a06f1adb5edd9850523c897ea77 (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/widgets/Badge.png | bin | 0 -> 958 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 ec12d996bf..f0a1893502 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -72,6 +72,8 @@ with the same filename but different name <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" /> <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" /> + <texture name="Badge" file_name="widgets/Badge.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" /> + <texture name="Blank" file_name="Blank.png" preload="false" /> diff --git a/indra/newview/skins/default/textures/widgets/Badge.png b/indra/newview/skins/default/textures/widgets/Badge.png Binary files differnew file mode 100644 index 0000000000..862b13d219 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Badge.png |