diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index a2b253791e..bef57a0096 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)
             {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 36cd8626cc..63e4611564 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -848,7 +848,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.SwapRootAgentCount(false);
             m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid);            
-            m_scene.CapsModule.AddCapsHandler(m_uuid);
+            //m_scene.CapsModule.AddCapsHandler(m_uuid);
 
             // On the next prim update, all objects will be sent
             //
@@ -1005,8 +1005,6 @@ namespace OpenSim.Region.Framework.Scenes
                 look = new Vector3(0.99f, 0.042f, 0);
             }
 
-            m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look);
-
             if (m_isChildAgent)
             {
                 m_isChildAgent = false;
@@ -1021,7 +1019,10 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 
                 //m_log.DebugFormat("Completed movement");
-            }
+            }
+
+            m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look);
+
         }
 
         /// <summary>