* 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

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index a2b2537..bef57a0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -940,7 +940,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        protected bool WaitForCallback(UUID id)
+        public bool WaitForCallback(UUID id)
         {
             int count = 20;
             while (m_agentsInTransit.Contains(id) && count-- > 0)
@@ -961,7 +961,7 @@ namespace OpenSim.Region.Framework.Scenes
             return ResetFromTransit(id);
         }
 
-        protected void SetInTransit(UUID id)
+        public void SetInTransit(UUID id)
         {
             lock (m_agentsInTransit)
             {