From 665269a27791df750d23026840c3ac86eeb85796 Mon Sep 17 00:00:00 2001 From: diva Date: Sun, 8 Feb 2009 00:54:56 +0000 Subject: * 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 --- OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs') 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) { -- cgit v1.1