aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-10-05 18:42:05 +0000
committerTeravus Ovares2008-10-05 18:42:05 +0000
commit3ac76db76b378525c001027596df9edbf4ed021e (patch)
tree473af36bc311922b784c1434ab89f97f9412394c
parentRevert the packet resend timing changes. They caused login issues in primmy (diff)
downloadopensim-SC_OLD-3ac76db76b378525c001027596df9edbf4ed021e.zip
opensim-SC_OLD-3ac76db76b378525c001027596df9edbf4ed021e.tar.gz
opensim-SC_OLD-3ac76db76b378525c001027596df9edbf4ed021e.tar.bz2
opensim-SC_OLD-3ac76db76b378525c001027596df9edbf4ed021e.tar.xz
* Fixes the last snag with the EventQueue. The situation where the seedcap gets lost on teleport.
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs4
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a0c59ad..0c52e5e 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -157,6 +157,7 @@ namespace OpenSim.Framework.Communications.Capabilities
157 { 157 {
158 // the root of all evil 158 // the root of all evil
159 m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); 159 m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest);
160 m_log.Warn("[SEED]: " + capsBase + m_requestPath);
160 //m_capsHandlers["MapLayer"] = 161 //m_capsHandlers["MapLayer"] =
161 // new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", 162 // new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST",
162 // capsBase + m_mapLayerPath, 163 // capsBase + m_mapLayerPath,
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index b342cb6..162e1c6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -682,10 +682,12 @@ namespace OpenSim.Region.Environment.Scenes
682 // failure at this point (unlike a border crossing failure). So perhaps this can never fail 682 // failure at this point (unlike a border crossing failure). So perhaps this can never fail
683 // once we reach here... 683 // once we reach here...
684 avatar.Scene.RemoveCapsHandler(avatar.UUID); 684 avatar.Scene.RemoveCapsHandler(avatar.UUID);
685 685 agent.child = false;
686 m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent); 686 m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent);
687
687 m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, 688 m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId,
688 position, false); 689 position, false);
690 Thread.Sleep(4000);
689 AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo(); 691 AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo();
690 692
691 // TODO Should construct this behind a method 693 // TODO Should construct this behind a method