Revert "git merge"

This reverts commit 80e1c3742a3ba7eb9aa1686a242b36f64331095a.

1 files changed, 10 insertions, 2 deletions

diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs
index dac7c75..b688a16 100644
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ b/OpenSim/Data/NHibernate/TextureUserType.cs
@@ -49,8 +49,16 @@ namespace OpenSim.Data.NHibernate
 
         public object DeepCopy(object texture)
         {
-            byte[] bytes = ((LLObject.TextureEntry)texture).ToBytes();
-            return new LLObject.TextureEntry(bytes, 0, bytes.Length);
+            if (texture == null) 
+            {
+                // TODO: should parametrize this texture out
+                return new LLObject.TextureEntry(new LLUUID("89556747-24cb-43ed-920b-47caed15465f"));
+            }
+            else 
+            {
+                byte[] bytes = ((LLObject.TextureEntry)texture).ToBytes();
+                return new LLObject.TextureEntry(bytes, 0, bytes.Length);
+            }
         }
 
         public object Disassemble(object texture)