diff options
author | Sean Dague | 2008-05-19 20:33:54 +0000 |
---|---|---|
committer | Sean Dague | 2008-05-19 20:33:54 +0000 |
commit | 7a52b35c574da5180131e1b5df613c4df09a5065 (patch) | |
tree | 0c2b3c01b419bba56d652176d82ec8faf6c73f6c /OpenSim/Region/Modules | |
parent | Thank you kindly, Melanie for a patch that avoids a null (diff) | |
download | opensim-SC-7a52b35c574da5180131e1b5df613c4df09a5065.zip opensim-SC-7a52b35c574da5180131e1b5df613c4df09a5065.tar.gz opensim-SC-7a52b35c574da5180131e1b5df613c4df09a5065.tar.bz2 opensim-SC-7a52b35c574da5180131e1b5df613c4df09a5065.tar.xz |
fix crash in standalone mode for initial appearance setup
Diffstat (limited to 'OpenSim/Region/Modules')
-rw-r--r-- | OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index 7dae702..837a4ec 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -60,7 +60,10 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
60 | public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance) | 60 | public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance) |
61 | { | 61 | { |
62 | appearance = m_scene.CommsManager.UserService.GetUserAppearance(avatarId); | 62 | appearance = m_scene.CommsManager.UserService.GetUserAppearance(avatarId); |
63 | return true; | 63 | if (appearance != null) |
64 | return true; | ||
65 | else | ||
66 | return false; | ||
64 | 67 | ||
65 | // //should only let one thread at a time do this part | 68 | // //should only let one thread at a time do this part |
66 | // EventWaitHandle waitHandle = null; | 69 | // EventWaitHandle waitHandle = null; |