diff options
* Removed the duplicate AddCapsHandler that existed in ScenePresence.MakeRootAgent; CAPs are already in place when this runs.
* Moved MoveAgentIntoRegion further down in the CompleteMovement method.
* changed a couple of methods from protected to public in SceneCommunicationService
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 36cd862..63e4611 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -848,7 +848,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
848 | 848 | ||
849 | m_scene.SwapRootAgentCount(false); | 849 | m_scene.SwapRootAgentCount(false); |
850 | m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid); | 850 | m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid); |
851 | m_scene.CapsModule.AddCapsHandler(m_uuid); | 851 | //m_scene.CapsModule.AddCapsHandler(m_uuid); |
852 | 852 | ||
853 | // On the next prim update, all objects will be sent | 853 | // On the next prim update, all objects will be sent |
854 | // | 854 | // |
@@ -1005,8 +1005,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1005 | look = new Vector3(0.99f, 0.042f, 0); | 1005 | look = new Vector3(0.99f, 0.042f, 0); |
1006 | } | 1006 | } |
1007 | 1007 | ||
1008 | m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look); | ||
1009 | |||
1010 | if (m_isChildAgent) | 1008 | if (m_isChildAgent) |
1011 | { | 1009 | { |
1012 | m_isChildAgent = false; | 1010 | m_isChildAgent = false; |
@@ -1021,7 +1019,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1021 | } | 1019 | } |
1022 | 1020 | ||
1023 | //m_log.DebugFormat("Completed movement"); | 1021 | //m_log.DebugFormat("Completed movement"); |
1024 | } | 1022 | } |
1023 | |||
1024 | m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look); | ||
1025 | |||
1025 | } | 1026 | } |
1026 | 1027 | ||
1027 | /// <summary> | 1028 | /// <summary> |