diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-09-26 10:39:21 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-09-26 10:39:21 -0700 |
| commit | 42dce6766435da1deaea19e837629fdf38c0018d (patch) | |
| tree | 063491157df3319f70c811b2b4555806fcd681f8 /indra/newview/skins/default/textures | |
| parent | d258fe40353642b20524ef320b70e6b9bf0f8ec4 (diff) | |
| parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Default_Outfit_Photo.png | bin | 0 -> 19459 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/first_login_image_left.png | bin | 311306 -> 384997 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/first_login_image_right.png | bin | 329170 -> 340188 bytes |
4 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.png b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.png Binary files differnew file mode 100644 index 0000000000..bacddcbb68 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 72037a84b3..a9a4913b21 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -806,6 +806,7 @@ with the same filename but different name <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/> <texture name="NavBar Separator" file_name="navbar/separator.png"/> + <texture name="Default_Outfit_Photo" file_name="icons/Default_Outfit_Photo.png" preload="true"/> <texture name="Notification_Condense" file_name="icons/Icon_Notification_Condense.png" preload="true"/> <texture name="Notification_Expand" file_name="icons/Icon_Notification_Expand.png" preload="true"/> <texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/> diff --git a/indra/newview/skins/default/textures/windows/first_login_image_left.png b/indra/newview/skins/default/textures/windows/first_login_image_left.png Binary files differindex b405a88245..1fa10fde53 100644 --- a/indra/newview/skins/default/textures/windows/first_login_image_left.png +++ b/indra/newview/skins/default/textures/windows/first_login_image_left.png diff --git a/indra/newview/skins/default/textures/windows/first_login_image_right.png b/indra/newview/skins/default/textures/windows/first_login_image_right.png Binary files differindex 22a6dd8a53..d764d846b7 100644 --- a/indra/newview/skins/default/textures/windows/first_login_image_right.png +++ b/indra/newview/skins/default/textures/windows/first_login_image_right.png |
