aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorSean Dague2008-05-21 18:02:09 +0000
committerSean Dague2008-05-21 18:02:09 +0000
commit53bcf2139e7c8c9da2fbbcafc45704eae3bc5daa (patch)
tree6773914f9fd12e53240ce7c3ce8dad3e47ed9a1d /OpenSim/Region
parentIZ QUATERNION NORMALIZE TO 0? NOWAI! KTHXBYE (diff)
downloadopensim-SC-53bcf2139e7c8c9da2fbbcafc45704eae3bc5daa.zip
opensim-SC-53bcf2139e7c8c9da2fbbcafc45704eae3bc5daa.tar.gz
opensim-SC-53bcf2139e7c8c9da2fbbcafc45704eae3bc5daa.tar.bz2
opensim-SC-53bcf2139e7c8c9da2fbbcafc45704eae3bc5daa.tar.xz
this removes use of the mapper for wearables, and I can confirm things
get saved to the database. There are still issues on wearing things after a cleared cache that I'm looking at now.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs5
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index d0b87fd..f70eb45 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1456,8 +1456,7 @@ namespace OpenSim.Region.Environment.Scenes
1456 1456
1457 SendFullUpdateToAllClients(); 1457 SendFullUpdateToAllClients();
1458 SendAppearanceToAllOtherAgents(); 1458 SendAppearanceToAllOtherAgents();
1459 // This is probably egregious 1459 SendOwnAppearance();
1460 m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
1461 } 1460 }
1462 1461
1463 1462
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index 37b7e8d..5c5cb17 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -61,9 +61,14 @@ namespace OpenSim.Region.Modules.AvatarFactory
61 { 61 {
62 appearance = m_scene.CommsManager.UserService.GetUserAppearance(avatarId); 62 appearance = m_scene.CommsManager.UserService.GetUserAppearance(avatarId);
63 if (appearance != null) 63 if (appearance != null)
64 {
64 return true; 65 return true;
66 }
65 else 67 else
68 {
69 m_log.InfoFormat("[APPEARANCE] appearance not found for {0}", avatarId.ToString());
66 return false; 70 return false;
71 }
67 72
68 // //should only let one thread at a time do this part 73 // //should only let one thread at a time do this part
69 // EventWaitHandle waitHandle = null; 74 // EventWaitHandle waitHandle = null;