From 5bd5770ed2a5c2087a75489ed512ea59f7f25a1a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Fri, 28 Dec 2007 05:36:28 +0000 Subject: * Patch from Melanie. Thanks Melanie! * This patch addresses a regression where 5 default textures, including the default "new prim" texture, would not be shown unless in viewer cache. * Further, it supplies a new plywood texture as the base texture, which is purpose-made from locally photo-sourced material (means i took a picture and made it into a tile), which is closer in appearance and color to the Linden one. * It changes the default new prim texture UUID to match the UUID generated by the viewer when "default" is clicked, which is a texture UUID hardcoded in some scripts as well, so it would cause compatibility issues if not addressed. * The patch fixes a number of UUID duplications (same UUID for asset and inventory items) and capitalization issues in the XML files. * It also includes new versions of 4 other textures, which were no longer loadable in grid mode. --- bin/OpenSimAssetSet.xml | 30 +++++++++++------------------- bin/OpenSimLibrary.xml | 12 ++++++------ bin/assets/bricks.jp2 | Bin 157424 -> 82167 bytes bin/assets/granite.jp2 | Bin 130736 -> 82167 bytes bin/assets/hardwood.jp2 | Bin 67673 -> 98231 bytes bin/assets/plywood.jp2 | Bin 15720 -> 79234 bytes bin/assets/rocks.jp2 | Bin 185594 -> 82167 bytes 7 files changed, 17 insertions(+), 25 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimAssetSet.xml b/bin/OpenSimAssetSet.xml index 8d93035..21e298a 100644 --- a/bin/OpenSimAssetSet.xml +++ b/bin/OpenSimAssetSet.xml @@ -335,49 +335,41 @@ - -
+
- +
-
- - +
+ +
-
+
- +
-
+
- +
-
+
- +
-
- - - - - -
diff --git a/bin/OpenSimLibrary.xml b/bin/OpenSimLibrary.xml index d209635..3421a4a 100644 --- a/bin/OpenSimLibrary.xml +++ b/bin/OpenSimLibrary.xml @@ -540,7 +540,7 @@
- + @@ -552,7 +552,7 @@
- + @@ -564,7 +564,7 @@
- + @@ -576,8 +576,8 @@
- - + + @@ -588,7 +588,7 @@
- + diff --git a/bin/assets/bricks.jp2 b/bin/assets/bricks.jp2 index def093d..6113881 100644 Binary files a/bin/assets/bricks.jp2 and b/bin/assets/bricks.jp2 differ diff --git a/bin/assets/granite.jp2 b/bin/assets/granite.jp2 index 8ecad58..6113881 100644 Binary files a/bin/assets/granite.jp2 and b/bin/assets/granite.jp2 differ diff --git a/bin/assets/hardwood.jp2 b/bin/assets/hardwood.jp2 index 229424c..ff0fcce 100644 Binary files a/bin/assets/hardwood.jp2 and b/bin/assets/hardwood.jp2 differ diff --git a/bin/assets/plywood.jp2 b/bin/assets/plywood.jp2 index 60365cc..2053675 100644 Binary files a/bin/assets/plywood.jp2 and b/bin/assets/plywood.jp2 differ diff --git a/bin/assets/rocks.jp2 b/bin/assets/rocks.jp2 index 1e3dbfd..6113881 100644 Binary files a/bin/assets/rocks.jp2 and b/bin/assets/rocks.jp2 differ -- cgit v1.1