diff options
author | Teravus Ovares | 2007-12-12 00:38:57 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-12 00:38:57 +0000 |
commit | 9abe4b2ebf537d32b0b01d404497f290a4f4f806 (patch) | |
tree | 63c12f570f5e82ccc54b99a805c41ce84abeba65 /OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs | |
parent | put in a try block to catch the ForEach loop dying. (diff) | |
download | opensim-SC-9abe4b2ebf537d32b0b01d404497f290a4f4f806.zip opensim-SC-9abe4b2ebf537d32b0b01d404497f290a4f4f806.tar.gz opensim-SC-9abe4b2ebf537d32b0b01d404497f290a4f4f806.tar.bz2 opensim-SC-9abe4b2ebf537d32b0b01d404497f290a4f4f806.tar.xz |
* 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.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs | 9 |
1 files changed, 8 insertions, 1 deletions
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 | |||
55 | byte[] visualParams; | 55 | byte[] visualParams; |
56 | GetDefaultAvatarAppearance(out wearables, out visualParams); | 56 | GetDefaultAvatarAppearance(out wearables, out visualParams); |
57 | appearance = new AvatarAppearance(avatarId, wearables, visualParams); | 57 | appearance = new AvatarAppearance(avatarId, wearables, visualParams); |
58 | m_avatarsAppearance[avatarId] = appearance; | 58 | try |
59 | { | ||
60 | m_avatarsAppearance[avatarId] = appearance; | ||
61 | } | ||
62 | catch (System.NullReferenceException) | ||
63 | { | ||
64 | OpenSim.Framework.Console.MainLog.Instance.Error("AVATAR", "Unable to load appearance for uninitialized avatar"); | ||
65 | } | ||
59 | return true; | 66 | return true; |
60 | } | 67 | } |
61 | } | 68 | } |