* 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. 

2 files changed, 4 insertions, 4 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
+}