diff options
author | diva | 2008-12-18 19:45:55 +0000 |
---|---|---|
committer | diva | 2008-12-18 19:45:55 +0000 |
commit | d04247d41894010581ecbb5dc8da723731c2100f (patch) | |
tree | 34e553b0e1665355f7374a95d2be4f67af15b709 | |
parent | Fix and streamline the RegionHandshake stuff for estate managers (diff) | |
download | opensim-SC-d04247d41894010581ecbb5dc8da723731c2100f.zip opensim-SC-d04247d41894010581ecbb5dc8da723731c2100f.tar.gz opensim-SC-d04247d41894010581ecbb5dc8da723731c2100f.tar.bz2 opensim-SC-d04247d41894010581ecbb5dc8da723731c2100f.tar.xz |
Removing a check in Teleports. This check should be there, I think, but it may be causing problems right now.
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 142e07e..ca6778a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -278,7 +278,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
278 | { | 278 | { |
279 | // Let's wait just a little to give time to originating regions to catch up with closing child agents | 279 | // Let's wait just a little to give time to originating regions to catch up with closing child agents |
280 | // after a cross here | 280 | // after a cross here |
281 | Thread.Sleep(200); | 281 | Thread.Sleep(500); |
282 | 282 | ||
283 | uint x, y; | 283 | uint x, y; |
284 | Utils.LongToUInts(reg.RegionHandle, out x, out y); | 284 | Utils.LongToUInts(reg.RegionHandle, out x, out y); |
@@ -593,18 +593,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
593 | foreach (ulong regionHandle in regionlst) | 593 | foreach (ulong regionHandle in regionlst) |
594 | { | 594 | { |
595 | m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); | 595 | m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); |
596 | bool regionAccepted = m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); | 596 | //bool regionAccepted = m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); |
597 | // let's do our best, but there's not much we can do if the neighbour doesn't accept. | ||
598 | m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); | ||
597 | 599 | ||
598 | if (regionAccepted) | 600 | //if (regionAccepted) |
599 | { | 601 | //{ |
600 | m_log.Info("[INTERGRID]: Completed sending agent Close agent Request to neighbor"); | 602 | // m_log.Info("[INTERGRID]: Completed sending agent Close agent Request to neighbor"); |
601 | 603 | ||
602 | } | 604 | //} |
603 | else | 605 | //else |
604 | { | 606 | //{ |
605 | m_log.Info("[INTERGRID]: Failed sending agent Close agent Request to neighbor"); | 607 | // m_log.Info("[INTERGRID]: Failed sending agent Close agent Request to neighbor"); |
606 | 608 | ||
607 | } | 609 | //} |
608 | 610 | ||
609 | } | 611 | } |
610 | //// We remove the list of known regions from the agent's known region list through an event | 612 | //// We remove the list of known regions from the agent's known region list through an event |
@@ -804,16 +806,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
804 | } | 806 | } |
805 | 807 | ||
806 | 808 | ||
807 | if (!m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, | 809 | m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, |
808 | position, false)) | 810 | position, false); |
809 | { | 811 | //{ |
810 | avatar.ControllingClient.SendTeleportFailed("Problem with destination."); | 812 | // avatar.ControllingClient.SendTeleportFailed("Problem with destination."); |
811 | // We should close that agent we just created over at destination... | 813 | // // We should close that agent we just created over at destination... |
812 | List<ulong> lst = new List<ulong>(); | 814 | // List<ulong> lst = new List<ulong>(); |
813 | lst.Add(reg.RegionHandle); | 815 | // lst.Add(reg.RegionHandle); |
814 | SendCloseChildAgentAsync(avatar.UUID, lst); | 816 | // SendCloseChildAgentAsync(avatar.UUID, lst); |
815 | return; | 817 | // return; |
816 | } | 818 | //} |
817 | 819 | ||
818 | Thread.Sleep(2000); | 820 | Thread.Sleep(2000); |
819 | 821 | ||