aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorSean Dague2008-05-22 17:39:13 +0000
committerSean Dague2008-05-22 17:39:13 +0000
commitfb120e3e236888247e7e2ba1858878040cfa766a (patch)
tree9fc563080228d35730a6c506ba0a23ae1a2d2807 /OpenSim/Region
parent* Documentation for load/save xml methods (diff)
downloadopensim-SC_OLD-fb120e3e236888247e7e2ba1858878040cfa766a.zip
opensim-SC_OLD-fb120e3e236888247e7e2ba1858878040cfa766a.tar.gz
opensim-SC_OLD-fb120e3e236888247e7e2ba1858878040cfa766a.tar.bz2
opensim-SC_OLD-fb120e3e236888247e7e2ba1858878040cfa766a.tar.xz
catch case where avatar might have been child agent
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index 0b75e89..4b8eee7 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -117,11 +117,16 @@ namespace OpenSim.Region.Modules.AvatarFactory
117 { 117 {
118 IClientAPI clientView = (IClientAPI)sender; 118 IClientAPI clientView = (IClientAPI)sender;
119 ScenePresence avatar = m_scene.GetScenePresence(clientView.AgentId); 119 ScenePresence avatar = m_scene.GetScenePresence(clientView.AgentId);
120 if(avatar == null) {
121 m_log.Info("Avatar is child agent, ignoring AvatarIsWearing event");
122 return;
123 }
124
120 CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(clientView.AgentId); 125 CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(clientView.AgentId);
121 126
122 AvatarAppearance avatAppearance = null; 127 AvatarAppearance avatAppearance = null;
123 if(!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) { 128 if(!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) {
124 m_log.Info("We didn't seem to find the appearance"); 129 m_log.Info("We didn't seem to find the appearance, falling back to ScenePresense");
125 avatAppearance = avatar.Appearance; 130 avatAppearance = avatar.Appearance;
126 } 131 }
127 m_log.Info("Calling Avatar is Wearing"); 132 m_log.Info("Calling Avatar is Wearing");