aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2013-01-23 18:17:49 +0100
committerMelanie2013-01-23 18:17:49 +0100
commit997d53e5320e016027eb915fb67de96b501752bb (patch)
tree7133a02636f5e318b74104b3b63125409c2ea27a /OpenSim
parentGuard against XMLRPC module ref being null, which will happen if it's disabled (diff)
downloadopensim-SC_OLD-997d53e5320e016027eb915fb67de96b501752bb.zip
opensim-SC_OLD-997d53e5320e016027eb915fb67de96b501752bb.tar.gz
opensim-SC_OLD-997d53e5320e016027eb915fb67de96b501752bb.tar.bz2
opensim-SC_OLD-997d53e5320e016027eb915fb67de96b501752bb.tar.xz
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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs17
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 0c8a2b1..cb09047 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -402,14 +402,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
402 { 402 {
403 // Record that this agent is in transit so that we can prevent simultaneous requests and do later detection 403 // Record that this agent is in transit so that we can prevent simultaneous requests and do later detection
404 // of whether the destination region completes the teleport. 404 // of whether the destination region completes the teleport.
405 if (!m_entityTransferStateMachine.SetInTransit(sp.UUID)) 405 m_entityTransferStateMachine.SetInTransit(sp.UUID);
406 { 406// if (!m_entityTransferStateMachine.SetInTransit(sp.UUID))
407 m_log.DebugFormat( 407// {
408 "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2} ({3}) {4}/{5} - agent is already in transit.", 408// m_log.DebugFormat(
409 sp.Name, sp.UUID, reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position); 409// "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2} ({3}) {4}/{5} - agent is already in transit.",
410 410// sp.Name, sp.UUID, reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position);
411 return; 411//
412 } 412// return;
413// }
413 414
414 if (reg == null || finalDestination == null) 415 if (reg == null || finalDestination == null)
415 { 416 {