diff options
| author | Melanie | 2009-12-30 22:24:14 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-30 22:24:14 +0000 |
| commit | a21ce9151b22c75117c4ea4d2a300c302ff78d6a (patch) | |
| tree | 8875cc8058a18645fa94ef055367046d23340e84 /OpenSim/Region/Framework/Scenes/Hypergrid | |
| parent | Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensi... (diff) | |
| parent | * Fixes Sitting on the ground. (diff) | |
| download | opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.zip opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.gz opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.bz2 opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Hypergrid')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs index 0f9c190..416826c 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | |||
| @@ -203,7 +203,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
| 203 | string reason = String.Empty; | 203 | string reason = String.Empty; |
| 204 | 204 | ||
| 205 | //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) | 205 | //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) |
| 206 | if (!m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, agentCircuit, out reason)) | 206 | if (!m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, agentCircuit, teleportFlags, out reason)) |
| 207 | { | 207 | { |
| 208 | avatar.ControllingClient.SendTeleportFailed(String.Format("Destination is not accepting teleports: {0}", | 208 | avatar.ControllingClient.SendTeleportFailed(String.Format("Destination is not accepting teleports: {0}", |
| 209 | reason)); | 209 | reason)); |