diff options
author | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
commit | 2920d4c46f99c8c5bc8942a08a87fa204c57464b (patch) | |
tree | 515837435a28924b028815fc79f7f4f2ec18871e /indra/newview/skins/default/textures | |
parent | a146a0f27b3ea2fadaa9e7286645a0944996309d (diff) | |
parent | d674d11f895b8f3d578cded931cdc1c430379c95 (diff) |
merge
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 0788a0ca9e..4638c32886 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -376,6 +376,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" /> @@ -405,6 +407,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" /> |