aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-17 00:33:04 +0100
committerJustin Clark-Casey (justincc)2012-05-17 00:33:04 +0100
commite444cb9da4fd112733634dbda8b2844e69097ec4 (patch)
tree9c355b98044c32cac49c19fba06d3e8a9fd67b94
parentRoute OAR SOG loading through the common SceneObjectSerializer.FromXml2Format... (diff)
downloadopensim-SC_OLD-e444cb9da4fd112733634dbda8b2844e69097ec4.zip
opensim-SC_OLD-e444cb9da4fd112733634dbda8b2844e69097ec4.tar.gz
opensim-SC_OLD-e444cb9da4fd112733634dbda8b2844e69097ec4.tar.bz2
opensim-SC_OLD-e444cb9da4fd112733634dbda8b2844e69097ec4.tar.xz
Remove redundant "Teleport failed:" from reason when QueryAccess fails for the destination simulator. This part of the string is already provided by the viewer.
Also adds more reason logging for diagnostics when teleports are refused/fail.
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs16
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index d0aead5..5dbe5e4 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -432,11 +432,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
432 432
433 string reason; 433 string reason;
434 string version; 434 string version;
435 if (!m_aScene.SimulationService.QueryAccess(finalDestination, sp.ControllingClient.AgentId, Vector3.Zero, out version, out reason)) 435 if (!m_aScene.SimulationService.QueryAccess(
436 finalDestination, sp.ControllingClient.AgentId, Vector3.Zero, out version, out reason))
436 { 437 {
437 sp.ControllingClient.SendTeleportFailed("Teleport failed: " + reason); 438 sp.ControllingClient.SendTeleportFailed(reason);
438 ResetFromTransit(sp.UUID); 439 ResetFromTransit(sp.UUID);
439 440
441 m_log.DebugFormat(
442 "[ENTITY TRANSFER MODULE]: {0} was stopped from teleporting from {1} to {2} because {3}",
443 sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason);
444
440 return; 445 return;
441 } 446 }
442 447
@@ -479,10 +484,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
479 bool logout = false; 484 bool logout = false;
480 if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout)) 485 if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout))
481 { 486 {
482 sp.ControllingClient.SendTeleportFailed( 487 sp.ControllingClient.SendTeleportFailed(String.Format("Teleport refused: {0}", reason));
483 String.Format("Teleport refused: {0}", reason));
484 ResetFromTransit(sp.UUID); 488 ResetFromTransit(sp.UUID);
485 489
490 m_log.DebugFormat(
491 "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}",
492 sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason);
493
486 return; 494 return;
487 } 495 }
488 496