diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a1296ba96b..312ce26e4a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -5130,7 +5130,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (changeFlags == 0)
                 return;
-            m_shape.TextureEntry = newTex.GetBytes();
+            m_shape.TextureEntry = newTex.GetBytes(9);
             TriggerScriptChangedEvent(changeFlags);
             ParentGroup.HasGroupChanged = true;
             ScheduleUpdate(PrimUpdateFlags.Textures);
@@ -5159,7 +5159,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (changeFlags == 0)
                 return;
 
-            m_shape.TextureEntry = newTex.GetBytes();
+            m_shape.TextureEntry = newTex.GetBytes(9);
             TriggerScriptChangedEvent(changeFlags);
             ParentGroup.HasGroupChanged = true;
             ScheduleUpdate(PrimUpdateFlags.Textures);
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 516f9eb4bd..822439fb5e 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -323,7 +323,7 @@ namespace OpenSim.Region.OptionalModules.Materials
             }
 
             if(facechanged)
-                part.Shape.TextureEntry = te.GetBytes();
+                part.Shape.TextureEntry = te.GetBytes(9);
 
             if(facechanged || partchanged)
             {
@@ -632,7 +632,7 @@ namespace OpenSim.Region.OptionalModules.Materials
                                             faceEntry.MaterialID = id;
                                             //m_log.DebugFormat("[Materials]: in \"{0}\" {1}, setting material ID for face {2} to {3}", sop.Name, sop.UUID, face, id);
                                             // We can't use sop.UpdateTextureEntry(te) because it filters, so do it manually
-                                            sop.Shape.TextureEntry = te.GetBytes();
+                                            sop.Shape.TextureEntry = te.GetBytes(9);
                                         }
 
                                         if(oldid != UUID.Zero)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 95d7a7a780..ab3562f35b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -10614,7 +10614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return false;
 
             texface.MaterialID = id;
-            part.Shape.TextureEntry = tex.GetBytes();
+            part.Shape.TextureEntry = tex.GetBytes(9);
             m_materialsModule.RemoveMaterial(oldid);
             return true;
         }
@@ -10671,7 +10671,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return false;
 
             texface.MaterialID = id;
-            part.Shape.TextureEntry = tex.GetBytes();
+            part.Shape.TextureEntry = tex.GetBytes(9);
             m_materialsModule.RemoveMaterial(oldid);
             return true;
         }
@@ -10738,7 +10738,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return false;
 
             texface.MaterialID = id;
-            part.Shape.TextureEntry = tex.GetBytes();
+            part.Shape.TextureEntry = tex.GetBytes(9);
             m_materialsModule.RemoveMaterial(oldid);
             return true;
         }
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index b7ddd0bd18..02edd6c1d3 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ