diff options
author | Oren Hurvitz | 2014-04-09 08:03:25 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-09 09:22:20 +0100 |
commit | 06e0528d0b9929cbd8d2b360b0baa00288340d13 (patch) | |
tree | 0ffd33e5eda96badff712bdd78794ce6debbb392 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation | |
parent | Log when the presence service logs-out all the users in a region (diff) | |
download | opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.zip opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.tar.gz opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.tar.bz2 opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.tar.xz |
In teleports, pass the source region to the destination (similar to an HTTP referrer)
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index dc06e4b..3348b42 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -205,7 +205,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
205 | * Agent-related communications | 205 | * Agent-related communications |
206 | */ | 206 | */ |
207 | 207 | ||
208 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) | 208 | public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) |
209 | { | 209 | { |
210 | if (destination == null) | 210 | if (destination == null) |
211 | { | 211 | { |
@@ -217,7 +217,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
217 | if (m_scenes.ContainsKey(destination.RegionID)) | 217 | if (m_scenes.ContainsKey(destination.RegionID)) |
218 | { | 218 | { |
219 | // m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Found region {0} to send SendCreateChildAgent", destination.RegionName); | 219 | // m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Found region {0} to send SendCreateChildAgent", destination.RegionName); |
220 | return m_scenes[destination.RegionID].NewUserConnection(aCircuit, teleportFlags, out reason); | 220 | return m_scenes[destination.RegionID].NewUserConnection(aCircuit, teleportFlags, source, out reason); |
221 | } | 221 | } |
222 | 222 | ||
223 | reason = "Did not find region " + destination.RegionName; | 223 | reason = "Did not find region " + destination.RegionName; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index 5f43f08..8436488 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
162 | * Agent-related communications | 162 | * Agent-related communications |
163 | */ | 163 | */ |
164 | 164 | ||
165 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) | 165 | public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) |
166 | { | 166 | { |
167 | if (destination == null) | 167 | if (destination == null) |
168 | { | 168 | { |
@@ -172,13 +172,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
172 | } | 172 | } |
173 | 173 | ||
174 | // Try local first | 174 | // Try local first |
175 | if (m_localBackend.CreateAgent(destination, aCircuit, teleportFlags, out reason)) | 175 | if (m_localBackend.CreateAgent(source, destination, aCircuit, teleportFlags, out reason)) |
176 | return true; | 176 | return true; |
177 | 177 | ||
178 | // else do the remote thing | 178 | // else do the remote thing |
179 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) | 179 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
180 | { | 180 | { |
181 | return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason); | 181 | return m_remoteConnector.CreateAgent(source, destination, aCircuit, teleportFlags, out reason); |
182 | } | 182 | } |
183 | return false; | 183 | return false; |
184 | } | 184 | } |