From d6d4c267e0014f8c9f8f49fd9c332aa93504f3d4 Mon Sep 17 00:00:00 2001 From: diva Date: Mon, 15 Dec 2008 00:06:52 +0000 Subject: Bug fix for Hypergrid. This bug was introduced by the recent TP fixes, and affected the jump back home. --- .../Hypergrid/HGSceneCommunicationService.cs | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/Hypergrid') diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs index 4e94c52..9e23831 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs @@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid agent.InventoryFolder = UUID.Zero; agent.startpos = position; agent.child = true; - if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) + if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) { // brand new agent agent.CapsPath = Util.GetRandomCapsPath(); @@ -210,16 +210,19 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid // TODO: make Event Queue disablable! } - if (!m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, - position, false)) - { - avatar.ControllingClient.SendTeleportFailed("Problem with destination."); - // We should close that agent we just created over at destination... - List lst = new List(); - lst.Add(reg.RegionHandle); - SendCloseChildAgentAsync(avatar.UUID, lst); - return; - } + m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, + position, false); + + //if (!m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, + // position, false)) + //{ + // avatar.ControllingClient.SendTeleportFailed("Problem with destination."); + // // We should close that agent we just created over at destination... + // List lst = new List(); + // lst.Add(realHandle); + // SendCloseChildAgentAsync(avatar.UUID, lst); + // return; + //} Thread.Sleep(2000); -- cgit v1.1