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.
---
OpenSim/Framework/PrimitiveBaseShape.cs | 4 ++--
OpenSim/Region/ClientStack/ClientView.cs | 4 ++--
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
9 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index c29b973..66511e6 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Framework
static PrimitiveBaseShape()
{
m_defaultTexture =
- new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));
+ new LLObject.TextureEntry(new LLUUID("89556747-24cb-43ed-920b-47caed15465f"));
}
public PrimitiveBaseShape()
@@ -238,4 +238,4 @@ namespace OpenSim.Framework
Scale.X = Scale.Y = radius*2f;
}
}
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index e8ae2a7..dcb1a47 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -3520,7 +3520,7 @@ namespace OpenSim.Region.ClientStack
shape.PathTaperY = addPacket.ObjectData.PathTaperY;
shape.PathTwist = addPacket.ObjectData.PathTwist;
shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
- LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));
+ LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("89556747-24cb-43ed-920b-47caed15465f"));
shape.Textures = ntex;
return shape;
}
@@ -3537,4 +3537,4 @@ namespace OpenSim.Region.ClientStack
OutPacket(logReply, ThrottleOutPacketType.Task);
}
}
-}
\ No newline at end of file
+}
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 @@
-
-
+
+
@@ -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