aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordiva2009-02-08 00:54:56 +0000
committerdiva2009-02-08 00:54:56 +0000
commit665269a27791df750d23026840c3ac86eeb85796 (patch)
treefcd6795886e5cf8ef0c720aac498ee8ea5a9f68a /OpenSim
parentBug fix related to the filling out the remoting port in RegionInfo. It still ... (diff)
downloadopensim-SC_OLD-665269a27791df750d23026840c3ac86eeb85796.zip
opensim-SC_OLD-665269a27791df750d23026840c3ac86eeb85796.tar.gz
opensim-SC_OLD-665269a27791df750d23026840c3ac86eeb85796.tar.bz2
opensim-SC_OLD-665269a27791df750d23026840c3ac86eeb85796.tar.xz
* 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 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs9
2 files changed, 7 insertions, 6 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
940 } 940 }
941 } 941 }
942 942
943 protected bool WaitForCallback(UUID id) 943 public bool WaitForCallback(UUID id)
944 { 944 {
945 int count = 20; 945 int count = 20;
946 while (m_agentsInTransit.Contains(id) && count-- > 0) 946 while (m_agentsInTransit.Contains(id) && count-- > 0)
@@ -961,7 +961,7 @@ namespace OpenSim.Region.Framework.Scenes
961 return ResetFromTransit(id); 961 return ResetFromTransit(id);
962 } 962 }
963 963
964 protected void SetInTransit(UUID id) 964 public void SetInTransit(UUID id)
965 { 965 {
966 lock (m_agentsInTransit) 966 lock (m_agentsInTransit)
967 { 967 {
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>