aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-07 23:17:31 +0100
committerJustin Clark-Casey (justincc)2013-08-07 23:17:31 +0100
commitb10710d4a5f7fb33ee9b90aefac16ac3d4647db6 (patch)
treecc80637dd6261f3e384f56f3cd83251fe2d04979 /OpenSim/Region/CoreModules
parentAdd post-CreateAgent teleport cancellation/abortion functionality from v1 tra... (diff)
downloadopensim-SC_OLD-b10710d4a5f7fb33ee9b90aefac16ac3d4647db6.zip
opensim-SC_OLD-b10710d4a5f7fb33ee9b90aefac16ac3d4647db6.tar.gz
opensim-SC_OLD-b10710d4a5f7fb33ee9b90aefac16ac3d4647db6.tar.bz2
opensim-SC_OLD-b10710d4a5f7fb33ee9b90aefac16ac3d4647db6.tar.xz
minor: add some method doc to ScenePresence fields used for entity transfer, add minor details to some log messages, rename a misleading local variable name.
No functional changes.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs14
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 80c125a..01ef710 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -688,8 +688,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
688 if (version.Equals("SIMULATION/0.2")) 688 if (version.Equals("SIMULATION/0.2"))
689 TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason); 689 TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason);
690 else 690 else
691 TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason); 691 TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason);
692
693 } 692 }
694 693
695 private void TransferAgent_V1(ScenePresence sp, AgentCircuitData agentCircuit, GridRegion reg, GridRegion finalDestination, 694 private void TransferAgent_V1(ScenePresence sp, AgentCircuitData agentCircuit, GridRegion reg, GridRegion finalDestination,
@@ -698,7 +697,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
698 ulong destinationHandle = finalDestination.RegionHandle; 697 ulong destinationHandle = finalDestination.RegionHandle;
699 AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); 698 AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
700 699
701 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Using TP V1"); 700 m_log.DebugFormat(
701 "[ENTITY TRANSFER MODULE]: Using TP V1 for {0} going from {1} to {2}",
702 sp.Name, Scene.Name, finalDestination.RegionName);
703
702 // Let's create an agent there if one doesn't exist yet. 704 // Let's create an agent there if one doesn't exist yet.
703 // NOTE: logout will always be false for a non-HG teleport. 705 // NOTE: logout will always be false for a non-HG teleport.
704 bool logout = false; 706 bool logout = false;
@@ -1079,20 +1081,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1079 if (!sp.DoNotCloseAfterTeleport) 1081 if (!sp.DoNotCloseAfterTeleport)
1080 { 1082 {
1081 // OK, it got this agent. Let's close everything 1083 // OK, it got this agent. Let's close everything
1082 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Closing in agent {0} in region {1}", sp.Name, Scene.RegionInfo.RegionName); 1084 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Closing in agent {0} in region {1}", sp.Name, Scene.Name);
1083 sp.CloseChildAgents(newRegionX, newRegionY); 1085 sp.CloseChildAgents(newRegionX, newRegionY);
1084 sp.Scene.IncomingCloseAgent(sp.UUID, false); 1086 sp.Scene.IncomingCloseAgent(sp.UUID, false);
1085 1087
1086 } 1088 }
1087 else 1089 else
1088 { 1090 {
1089 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Not closing agent {0}, user is back in {0}", sp.Name, Scene.RegionInfo.RegionName); 1091 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Not closing agent {0}, user is back in {0}", sp.Name, Scene.Name);
1090 sp.DoNotCloseAfterTeleport = false; 1092 sp.DoNotCloseAfterTeleport = false;
1091 } 1093 }
1092 } 1094 }
1093 else 1095 else
1096 {
1094 // now we have a child agent in this region. 1097 // now we have a child agent in this region.
1095 sp.Reset(); 1098 sp.Reset();
1099 }
1096 } 1100 }
1097 1101
1098 /// <summary> 1102 /// <summary>