diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs index ad1c4ce..6545a99 100644 --- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | |||
@@ -132,13 +132,9 @@ namespace OpenSim.Region.CoreModules.Framework | |||
132 | { | 132 | { |
133 | Caps oldCaps = m_capsObjects[agentId]; | 133 | Caps oldCaps = m_capsObjects[agentId]; |
134 | 134 | ||
135 | m_log.DebugFormat( | 135 | //m_log.WarnFormat( |
136 | "[CAPS]: Recreating caps for agent {0}. Old caps path {1}, new caps path {2}. ", | 136 | // "[CAPS]: Recreating caps for agent {0} in region {1}. Old caps path {2}, new caps path {3}. ", |
137 | agentId, oldCaps.CapsObjectPath, capsObjectPath); | 137 | // agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath); |
138 | // This should not happen. The caller code is confused. We need to fix that. | ||
139 | // CAPs can never be reregistered, or the client will be confused. | ||
140 | // Hence this return here. | ||
141 | //return; | ||
142 | } | 138 | } |
143 | 139 | ||
144 | caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName, | 140 | caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName, |
@@ -153,6 +149,7 @@ namespace OpenSim.Region.CoreModules.Framework | |||
153 | 149 | ||
154 | public void RemoveCaps(UUID agentId) | 150 | public void RemoveCaps(UUID agentId) |
155 | { | 151 | { |
152 | m_log.DebugFormat("[CAPS]: Remove caps for agent {0} in region {1}", agentId, m_scene.RegionInfo.RegionName); | ||
156 | lock (m_childrenSeeds) | 153 | lock (m_childrenSeeds) |
157 | { | 154 | { |
158 | if (m_childrenSeeds.ContainsKey(agentId)) | 155 | if (m_childrenSeeds.ContainsKey(agentId)) |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 3f1686c..96cd6b9 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -316,7 +316,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
316 | m_log.DebugFormat( | 316 | m_log.DebugFormat( |
317 | "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2}@{3} - agent is already in transit.", | 317 | "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2}@{3} - agent is already in transit.", |
318 | sp.Name, sp.UUID, position, regionHandle); | 318 | sp.Name, sp.UUID, position, regionHandle); |
319 | 319 | ||
320 | sp.ControllingClient.SendTeleportFailed("Slow down!"); | ||
320 | return; | 321 | return; |
321 | } | 322 | } |
322 | 323 | ||
@@ -1040,9 +1041,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1040 | // Now let's make it officially a child agent | 1041 | // Now let's make it officially a child agent |
1041 | sp.MakeChildAgent(); | 1042 | sp.MakeChildAgent(); |
1042 | 1043 | ||
1043 | // OK, it got this agent. Let's close some child agents | ||
1044 | sp.CloseChildAgents(newRegionX, newRegionY); | ||
1045 | |||
1046 | // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone | 1044 | // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone |
1047 | 1045 | ||
1048 | if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) | 1046 | if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) |
@@ -1059,10 +1057,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1059 | 1057 | ||
1060 | if (!sp.DoNotCloseAfterTeleport) | 1058 | if (!sp.DoNotCloseAfterTeleport) |
1061 | { | 1059 | { |
1060 | // OK, it got this agent. Let's close everything | ||
1061 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Closing in agent {0} in region {1}", sp.Name, Scene.RegionInfo.RegionName); | ||
1062 | sp.CloseChildAgents(newRegionX, newRegionY); | ||
1062 | sp.Scene.IncomingCloseAgent(sp.UUID, false); | 1063 | sp.Scene.IncomingCloseAgent(sp.UUID, false); |
1064 | |||
1063 | } | 1065 | } |
1064 | else | 1066 | else |
1065 | { | 1067 | { |
1068 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Not closing agent {0}, user is back in {0}", sp.Name, Scene.RegionInfo.RegionName); | ||
1066 | sp.DoNotCloseAfterTeleport = false; | 1069 | sp.DoNotCloseAfterTeleport = false; |
1067 | } | 1070 | } |
1068 | } | 1071 | } |