A slightly modified version of

http://opensimulator.org/mantis/view.php?id=4040 by jhurliman.    The patch didn't match up, so I winged it here.   My effort to manually merge the patch seems to make sense, so I'm going to commit it.

1 files changed, 7 insertions, 0 deletions

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 1fb01ba..940ae3b 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -510,6 +510,13 @@ namespace OpenSim.Framework
                 if (te != null && te.Length > 0)
                     Texture = new Primitive.TextureEntry(te, 0, te.Length);
             }
+            else
+            {
+                // We shouldn't be receiving appearance hashtables without a TextureEntry,
+                // but in case we do this will prevent a failure when saving to the database
+                Texture = GetDefaultTexture();
+            }
+
             
             AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]);