From e1d8dac25a93db837c780428a23f81cbf9109270 Mon Sep 17 00:00:00 2001 From: Melinda Green Date: Mon, 15 Dec 2008 21:21:19 +0000 Subject: svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4 --- .../skins/default/textures/default_land_picture.j2c | Bin 0 -> 24492 bytes .../skins/default/textures/default_profile_picture.j2c | Bin 0 -> 6128 bytes indra/newview/skins/default/textures/locked_image.j2c | Bin 0 -> 6140 bytes indra/newview/skins/default/textures/textures.xml | 4 ++++ 4 files changed, 4 insertions(+) create mode 100644 indra/newview/skins/default/textures/default_land_picture.j2c create mode 100644 indra/newview/skins/default/textures/default_profile_picture.j2c create mode 100644 indra/newview/skins/default/textures/locked_image.j2c (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/textures/default_land_picture.j2c b/indra/newview/skins/default/textures/default_land_picture.j2c new file mode 100644 index 0000000000..34df0291ae Binary files /dev/null and b/indra/newview/skins/default/textures/default_land_picture.j2c differ diff --git a/indra/newview/skins/default/textures/default_profile_picture.j2c b/indra/newview/skins/default/textures/default_profile_picture.j2c new file mode 100644 index 0000000000..c53a22e816 Binary files /dev/null and b/indra/newview/skins/default/textures/default_profile_picture.j2c differ diff --git a/indra/newview/skins/default/textures/locked_image.j2c b/indra/newview/skins/default/textures/locked_image.j2c new file mode 100644 index 0000000000..9e8998d675 Binary files /dev/null and b/indra/newview/skins/default/textures/locked_image.j2c differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 9e1d9b5196..34c9dea7e6 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -369,4 +369,8 @@ + + + + -- cgit v1.2.3