diff options
author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:04 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:04 -0500 |
commit | 11c6654479a299549dc0035faa894678a60e157e (patch) | |
tree | 267ebd388c62f41b4b19e9eb3e777ba60e368dba /indra/newview/skins | |
parent | a7aa89e2cb98c28be7b20bcae6dc1cb47f4d56c1 (diff) | |
parent | c6acd4723526ed82e79dccef18aaf4821e53dfeb (diff) |
merge changes for vmrg-227
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/textures/checker.png | bin | 0 -> 130 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/checker.png b/indra/newview/skins/default/textures/checker.png Binary files differnew file mode 100644 index 0000000000..1ab87e3f02 --- /dev/null +++ b/indra/newview/skins/default/textures/checker.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index e4a8622a4b..eabcc68916 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -122,6 +122,8 @@ with the same filename but different name <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" /> <texture name="Check_Mark" file_name="icons/check_mark.png" preload="true" /> + <texture name="Checker" file_name="checker.png" preload="false" /> + <texture name="Command_AboutLand_Icon" file_name="toolbar_icons/land.png" preload="true" /> <texture name="Command_Appearance_Icon" file_name="toolbar_icons/appearance.png" preload="true" /> <texture name="Command_Avatar_Icon" file_name="toolbar_icons/avatars.png" preload="true" /> |