aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Modules
diff options
context:
space:
mode:
authorSean Dague2008-05-20 22:37:18 +0000
committerSean Dague2008-05-20 22:37:18 +0000
commite3efe1de16593fd74e4ac881969fa40e17c22d0b (patch)
tree7c744d2c6d8d4aab3bd0ef59b0354aca4a26cc32 /OpenSim/Region/Modules
parentmove SceneEvents.cs to EventManager.cs, as that's actually (diff)
downloadopensim-SC_OLD-e3efe1de16593fd74e4ac881969fa40e17c22d0b.zip
opensim-SC_OLD-e3efe1de16593fd74e4ac881969fa40e17c22d0b.tar.gz
opensim-SC_OLD-e3efe1de16593fd74e4ac881969fa40e17c22d0b.tar.bz2
opensim-SC_OLD-e3efe1de16593fd74e4ac881969fa40e17c22d0b.tar.xz
attempt to fix mysql mapper usage
Diffstat (limited to 'OpenSim/Region/Modules')
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index 837a4ec..37b7e8d 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -284,7 +284,12 @@ namespace OpenSim.Region.Modules.AvatarFactory
284 IClientAPI clientView = (IClientAPI)sender; 284 IClientAPI clientView = (IClientAPI)sender;
285 ScenePresence avatar = m_scene.GetScenePresence(clientView.AgentId); 285 ScenePresence avatar = m_scene.GetScenePresence(clientView.AgentId);
286 CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(clientView.AgentId); 286 CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(clientView.AgentId);
287 AvatarAppearance avatAppearance = avatar.Appearance; 287
288 AvatarAppearance avatAppearance = null;
289 if(!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) {
290 m_log.Info("We didn't seem to find the appearance");
291 avatAppearance = avatar.Appearance;
292 }
288 m_log.Info("Calling Avatar is Wearing"); 293 m_log.Info("Calling Avatar is Wearing");
289 if (profile != null) 294 if (profile != null)
290 { 295 {
@@ -319,6 +324,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
319 } 324 }
320 } 325 }
321 m_scene.CommsManager.UserService.UpdateUserAppearance(clientView.AgentId, avatAppearance); 326 m_scene.CommsManager.UserService.UpdateUserAppearance(clientView.AgentId, avatAppearance);
327 avatar.Appearance = avatAppearance;
322 } 328 }
323 else 329 else
324 { 330 {