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

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 @@
     <Key Name="inventoryType" Value="0" />
     <Key Name="fileName" Value="peaches.jp2" />
   </Section>
-  <!-- Copied from hardcoded values -->
-  <Section Name="Bricks">
+  <Section Name="bricks">
     <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/>
-    <Key Name="name" Value="Bricks"/>
+    <Key Name="name" Value="bricks"/>
     <Key Name="assetType" Value="0" />
     <Key Name="inventoryType" Value="0" />
     <Key Name="fileName" Value="bricks.jp2"/>
   </Section>
-  <Section Name="Plywood">
-    <Key Name="assetID" Value="00000000-0000-1111-9999-000000000002"/>
-    <Key Name="name" Value="Plywood"/>
+  <Section Name="plywood">
+    <Key Name="assetID" Value="89556747-24cb-43ed-920b-47caed15465f"/>
+    <Key Name="name" Value="plywood"/>
     <Key Name="assetType" Value="0" />
     <Key Name="inventoryType" Value="0" />
     <Key Name="fileName" Value="plywood.jp2"/>
   </Section>
-  <Section Name="Rocks">
+  <Section Name="rocks">
     <Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/>
-    <Key Name="name" Value="Rocks"/>
+    <Key Name="name" Value="rocks"/>
     <Key Name="assetType" Value="0" />
     <Key Name="inventoryType" Value="0" />
     <Key Name="fileName" Value="rocks.jp2"/>
   </Section>
-  <Section Name="Granite">
+  <Section Name="granite">
     <Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/>
-    <Key Name="name" Value="Granite"/>
+    <Key Name="name" Value="granite"/>
     <Key Name="assetType" Value="0" />
     <Key Name="inventoryType" Value="0" />
     <Key Name="fileName" Value="granite.jp2"/>
   </Section>
-  <Section Name="Hardwood">
+  <Section Name="hardwood">
     <Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/>
-    <Key Name="name" Value="Hardwood"/>
+    <Key Name="name" Value="hardwood"/>
     <Key Name="assetType" Value="0" />
     <Key Name="inventoryType" Value="0" />
     <Key Name="fileName" Value="hardwood.jp2"/>
   </Section>
-  <Section Name="Prim Base Texture">
-    <Key Name="assetID" Value="00000000-0000-1111-5005-000000000005"/>
-    <Key Name="name" Value="Prim Base Texture"/>
-    <Key Name="assetType" Value="0" />
-    <Key Name="inventoryType" Value="0" />
-    <Key Name="fileName" Value="plywood.jp2"/>
-  </Section>
   <Section Name="Map Base Texture">
     <Key Name="assetID" Value="00000000-0000-1111-9999-000000000006"/>
     <Key Name="name" Value="Map Base Texture"/>
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 @@
     <Key Name="basePermissions" Value="2147483647" />
   </Section>
   <Section Name="bricks Texture">
-    <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000001"/>
+    <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000001"/>
     <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/>
     <Key Name="description" Value="bricks texture" />
     <Key Name="name" Value="bricks" />
@@ -552,7 +552,7 @@
     <Key Name="basePermissions" Value="2147483647" />
   </Section>
   <Section Name="granite Texture">
-    <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000004"/>
+    <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000004"/>
     <Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/>
     <Key Name="description" Value="granite texture" />
     <Key Name="name" Value="granite" />
@@ -564,7 +564,7 @@
     <Key Name="basePermissions" Value="2147483647" />
   </Section>
   <Section Name="hardwood Texture">
-    <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000005"/>
+    <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000005"/>
     <Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/>
     <Key Name="description" Value="hardwood texture" />
     <Key Name="name" Value="hardwood" />
@@ -576,8 +576,8 @@
     <Key Name="basePermissions" Value="2147483647" />
   </Section>
   <Section Name="plywood Texture">
-    <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000002"/>
-    <Key Name="assetID" Value="00000000-0000-1111-9999-000000000002"/>
+    <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000002"/>
+    <Key Name="assetID" Value="89556747-24cb-43ed-920b-47caed15465f"/>
     <Key Name="description" Value="plywood texture" />
     <Key Name="name" Value="plywood" />
     <Key Name="assetType" Value="0" />
@@ -588,7 +588,7 @@
     <Key Name="basePermissions" Value="2147483647" />
   </Section>
   <Section Name="rocks Texture">
-    <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000003"/>
+    <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000003"/>
     <Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/>
     <Key Name="description" Value="rocks texture" />
     <Key Name="name" Value="rocks" />
diff --git a/bin/assets/bricks.jp2 b/bin/assets/bricks.jp2
index def093d..6113881 100644
--- a/bin/assets/bricks.jp2
+++ b/bin/assets/bricks.jp2
diff --git a/bin/assets/granite.jp2 b/bin/assets/granite.jp2
index 8ecad58..6113881 100644
--- a/bin/assets/granite.jp2
+++ b/bin/assets/granite.jp2
diff --git a/bin/assets/hardwood.jp2 b/bin/assets/hardwood.jp2
index 229424c..ff0fcce 100644
--- a/bin/assets/hardwood.jp2
+++ b/bin/assets/hardwood.jp2
diff --git a/bin/assets/plywood.jp2 b/bin/assets/plywood.jp2
index 60365cc..2053675 100644
--- a/bin/assets/plywood.jp2
+++ b/bin/assets/plywood.jp2
diff --git a/bin/assets/rocks.jp2 b/bin/assets/rocks.jp2
index 1e3dbfd..6113881 100644
--- a/bin/assets/rocks.jp2
+++ b/bin/assets/rocks.jp2