From 9abe4b2ebf537d32b0b01d404497f290a4f4f806 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Wed, 12 Dec 2007 00:38:57 +0000
Subject: * Start listening for client connections immediately after a region
 initializes during initial instance startup.  (as opposed to waiting for 'all
 of the regions' to initialize first) * Removed hackish timer based client
 notification about regions up (no longer needed) * Added a comment about an
 inventory based login failure that causes me lots of greif testing and
 debugging.  Comment includes *why* it's failing.

---
 OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Modules')

diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index 979df59..86ddfaf 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -55,7 +55,14 @@ namespace OpenSim.Region.Environment.Modules
                 byte[] visualParams;
                 GetDefaultAvatarAppearance(out wearables, out visualParams);
                 appearance = new AvatarAppearance(avatarId, wearables, visualParams);
-                m_avatarsAppearance[avatarId] = appearance;
+                try
+                {
+                    m_avatarsAppearance[avatarId] = appearance;
+                }
+                catch (System.NullReferenceException)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Error("AVATAR", "Unable to load appearance for uninitialized avatar");
+                }
                 return true;
             }
         }
-- 
cgit v1.1