diff options
| author | Melanie | 2009-12-29 18:41:45 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-29 18:41:45 +0000 |
| commit | 67cfac0cf15d873666d2bbf5e2178d4242d702b4 (patch) | |
| tree | ae27113d3b127d6eccaa189cc601f3b6ab714788 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
| parent | One should not copy/paste so much :) (diff) | |
| parent | Change teleports so the TeleportFlags are sent to the destination sim. It (diff) | |
| download | opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.zip opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.gz opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.bz2 opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 0a02d39..8c808ab 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -286,7 +286,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 286 | string reason = String.Empty; | 286 | string reason = String.Empty; |
| 287 | 287 | ||
| 288 | 288 | ||
| 289 | bool regionAccepted = m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, a, out reason); | 289 | bool regionAccepted = m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, a, 0, out reason); |
| 290 | 290 | ||
| 291 | if (regionAccepted && newAgent) | 291 | if (regionAccepted && newAgent) |
| 292 | { | 292 | { |
| @@ -835,7 +835,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 835 | 835 | ||
| 836 | // Let's create an agent there if one doesn't exist yet. | 836 | // Let's create an agent there if one doesn't exist yet. |
| 837 | //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) | 837 | //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) |
| 838 | if (!m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, agentCircuit, out reason)) | 838 | if (!m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, agentCircuit, teleportFlags, out reason)) |
| 839 | { | 839 | { |
| 840 | avatar.ControllingClient.SendTeleportFailed(String.Format("Destination is not accepting teleports: {0}", | 840 | avatar.ControllingClient.SendTeleportFailed(String.Format("Destination is not accepting teleports: {0}", |
| 841 | reason)); | 841 | reason)); |