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

EXPERIMENTAL - Comment out the check for the agent already being in transit 

to prevent avatars being locked into their sim on a failed teleport.
May have side effects and must be revisited to fix right.
avinationmerge
Melanie 2013-01-23 18:17:49 +01:00
parent f667428283
commit 997d53e532
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -402,14 +402,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
{ {
// Record that this agent is in transit so that we can prevent simultaneous requests and do later detection // Record that this agent is in transit so that we can prevent simultaneous requests and do later detection
// of whether the destination region completes the teleport. // of whether the destination region completes the teleport.
if (!m_entityTransferStateMachine.SetInTransit(sp.UUID)) m_entityTransferStateMachine.SetInTransit(sp.UUID);
{ // if (!m_entityTransferStateMachine.SetInTransit(sp.UUID))
m_log.DebugFormat( // {
"[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2} ({3}) {4}/{5} - agent is already in transit.", // m_log.DebugFormat(
sp.Name, sp.UUID, reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position); // "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2} ({3}) {4}/{5} - agent is already in transit.",
// sp.Name, sp.UUID, reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position);
return; //
} // return;
// }
if (reg == null || finalDestination == null) if (reg == null || finalDestination == null)
{ {