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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Framework') 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 +} -- cgit v1.1