diff options
| author | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
| commit | 2205d1c486666399085f2e6d3b7d5d08474587cf (patch) | |
| tree | 10fa1e3ed522d4eefdd3770a531648ee2c9957f4 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
| parent | * Attempts to resolve the megaregion terrain edit rebound. (diff) | |
| parent | Fix an omission in LSL that causes a viewer crash (diff) | |
| download | opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.zip opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.gz opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.bz2 opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
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 e649139..f49d072 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 | { |
| @@ -810,7 +810,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 810 | 810 | ||
| 811 | // Let's create an agent there if one doesn't exist yet. | 811 | // Let's create an agent there if one doesn't exist yet. |
| 812 | //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) | 812 | //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) |
| 813 | if (!m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, agentCircuit, out reason)) | 813 | if (!m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, agentCircuit, teleportFlags, out reason)) |
| 814 | { | 814 | { |
| 815 | avatar.ControllingClient.SendTeleportFailed(String.Format("Destination is not accepting teleports: {0}", | 815 | avatar.ControllingClient.SendTeleportFailed(String.Format("Destination is not accepting teleports: {0}", |
| 816 | reason)); | 816 | reason)); |