OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removing a check in Teleports. This check should be there, I think, but it may be causing problems right now.

0.6.1-post-fixes
diva 2008-12-18 19:45:55 +00:00
parent 8231f9476c
commit d04247d418
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -278,7 +278,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
// Let's wait just a little to give time to originating regions to catch up with closing child agents // Let's wait just a little to give time to originating regions to catch up with closing child agents
// after a cross here // after a cross here
Thread.Sleep(200); Thread.Sleep(500);
uint x, y; uint x, y;
Utils.LongToUInts(reg.RegionHandle, out x, out y); Utils.LongToUInts(reg.RegionHandle, out x, out y);
@ -593,18 +593,20 @@ namespace OpenSim.Region.Environment.Scenes
foreach (ulong regionHandle in regionlst) foreach (ulong regionHandle in regionlst)
{ {
m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle);
bool regionAccepted = m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); //bool regionAccepted = m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID);
// let's do our best, but there's not much we can do if the neighbour doesn't accept.
m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID);
if (regionAccepted) //if (regionAccepted)
{ //{
m_log.Info("[INTERGRID]: Completed sending agent Close agent Request to neighbor"); // m_log.Info("[INTERGRID]: Completed sending agent Close agent Request to neighbor");
} //}
else //else
{ //{
m_log.Info("[INTERGRID]: Failed sending agent Close agent Request to neighbor"); // m_log.Info("[INTERGRID]: Failed sending agent Close agent Request to neighbor");
} //}
} }
//// We remove the list of known regions from the agent's known region list through an event //// 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
} }
if (!m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId,
position, false)) position, false);
{ //{
avatar.ControllingClient.SendTeleportFailed("Problem with destination."); // avatar.ControllingClient.SendTeleportFailed("Problem with destination.");
// We should close that agent we just created over at destination... // // We should close that agent we just created over at destination...
List<ulong> lst = new List<ulong>(); // List<ulong> lst = new List<ulong>();
lst.Add(reg.RegionHandle); // lst.Add(reg.RegionHandle);
SendCloseChildAgentAsync(avatar.UUID, lst); // SendCloseChildAgentAsync(avatar.UUID, lst);
return; // return;
} //}
Thread.Sleep(2000); Thread.Sleep(2000);