diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 17:41:39 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 17:41:39 +0100 |
| commit | ffae589843c2977ae7f70de78d84c936e2a91291 (patch) | |
| tree | 497660a88fe55382639dea1b2f3499241127470d /indra/newview/skins/default/textures | |
| parent | 63f2ddf377fa0fc6a666cdc1001289335d86258b (diff) | |
| parent | 25c29d59cf658acec5901c6f06775add10cf0bfd (diff) | |
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/Rounded_Rect.png | bin | 0 -> 338 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Person_Check.png | bin | 0 -> 3824 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Person_Star.png | bin | 0 -> 3762 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 |
4 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/Rounded_Rect.png b/indra/newview/skins/default/textures/Rounded_Rect.png Binary files differnew file mode 100644 index 0000000000..c270c28039 --- /dev/null +++ b/indra/newview/skins/default/textures/Rounded_Rect.png diff --git a/indra/newview/skins/default/textures/icons/Person_Check.png b/indra/newview/skins/default/textures/icons/Person_Check.png Binary files differnew file mode 100644 index 0000000000..f8638540d4 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Person_Check.png diff --git a/indra/newview/skins/default/textures/icons/Person_Star.png b/indra/newview/skins/default/textures/icons/Person_Star.png Binary files differnew file mode 100644 index 0000000000..ad10580ac4 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Person_Star.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 082b37d80b..f293bbd1af 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -358,6 +358,8 @@ with the same filename but different name <texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" /> <texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" /> <texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" /> + <texture name="Person_Check" file_name="icons/Person_Check.png" preload="false" /> + <texture name="Person_Star" file_name="icons/Person_Star.png" preload="false" /> <texture name="Play_Off" file_name="icons/Play_Off.png" preload="false" /> <texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" /> <texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" /> @@ -387,6 +389,7 @@ with the same filename but different name <texture name="Resize_Corner" file_name="windows/Resize_Corner.png" preload="true" /> + <texture name="Rounded_Rect" file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="24" scale.right="58" scale.bottom="6" /> <texture name="Rounded_Square" file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" /> <texture name="Row_Selection" file_name="navbar/Row_Selection.png" preload="false" /> |
