diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index c29b973e1e..66511e6502 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 e8ae2a7f29..dcb1a47d27 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 8d93035850..21e298a9ac 100644
--- a/bin/OpenSimAssetSet.xml
+++ b/bin/OpenSimAssetSet.xml
@@ -335,49 +335,41 @@
-
-
+
-
-
-
+
-
+
-
+
-
+
-
diff --git a/bin/OpenSimLibrary.xml b/bin/OpenSimLibrary.xml
index d209635edb..3421a4aeb2 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 def093d9a2..6113881486 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 8ecad5888d..6113881486 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 229424c026..ff0fccef47 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 60365ccd2e..2053675dc4 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 1e3dbfd809..6113881486 100644
Binary files a/bin/assets/rocks.jp2 and b/bin/assets/rocks.jp2 differ