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/Hypergrid | |
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_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.zip opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.gz opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.bz2 opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
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)); |