From 3ac76db76b378525c001027596df9edbf4ed021e Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sun, 5 Oct 2008 18:42:05 +0000 Subject: * Fixes the last snag with the EventQueue. The situation where the seedcap gets lost on teleport. --- OpenSim/Framework/Communications/Capabilities/Caps.cs | 1 + OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 { // the root of all evil m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); + m_log.Warn("[SEED]: " + capsBase + m_requestPath); //m_capsHandlers["MapLayer"] = // new LLSDStreamhandler("POST", // 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 // failure at this point (unlike a border crossing failure). So perhaps this can never fail // once we reach here... avatar.Scene.RemoveCapsHandler(avatar.UUID); - + agent.child = false; m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent); + m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, position, false); + Thread.Sleep(4000); AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo(); // TODO Should construct this behind a method -- cgit v1.1