diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs index 5e1621b..c53605f 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | |||
@@ -192,7 +192,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid | |||
192 | agentCircuit.CapsPath = Util.GetRandomCapsPath(); | 192 | agentCircuit.CapsPath = Util.GetRandomCapsPath(); |
193 | } | 193 | } |
194 | 194 | ||
195 | if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) | 195 | //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) |
196 | if (!m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, agentCircuit)) | ||
196 | { | 197 | { |
197 | avatar.ControllingClient.SendTeleportFailed("Destination is not accepting teleports."); | 198 | avatar.ControllingClient.SendTeleportFailed("Destination is not accepting teleports."); |
198 | return; | 199 | return; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 8b3ac4f..9282f14 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -296,7 +296,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
296 | string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort | 296 | string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort |
297 | + "/CAPS/" + a.CapsPath + "0000/"; | 297 | + "/CAPS/" + a.CapsPath + "0000/"; |
298 | 298 | ||
299 | bool regionAccepted = m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, a); | 299 | //bool regionAccepted = m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, a); |
300 | bool regionAccepted = m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, a); | ||
300 | 301 | ||
301 | if (regionAccepted && newAgent) | 302 | if (regionAccepted && newAgent) |
302 | { | 303 | { |
@@ -787,7 +788,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
787 | } | 788 | } |
788 | 789 | ||
789 | // Let's create an agent there if one doesn't exist yet. | 790 | // Let's create an agent there if one doesn't exist yet. |
790 | if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) | 791 | //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) |
792 | if (!m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, agentCircuit)) | ||
791 | { | 793 | { |
792 | avatar.ControllingClient.SendTeleportFailed("Destination is not accepting teleports."); | 794 | avatar.ControllingClient.SendTeleportFailed("Destination is not accepting teleports."); |
793 | return; | 795 | return; |