diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index 1e095ca..b402d2a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
137 | } | 137 | } |
138 | 138 | ||
139 | protected virtual void InitOnce(Scene scene) | 139 | protected virtual void InitOnce(Scene scene) |
140 | { | 140 | { |
141 | m_aScene = scene; | 141 | m_aScene = scene; |
142 | //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService); | 142 | //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService); |
143 | } | 143 | } |
@@ -160,7 +160,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
160 | * Agent-related communications | 160 | * Agent-related communications |
161 | */ | 161 | */ |
162 | 162 | ||
163 | public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) | 163 | public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, EntityTransferContext ctx, out string reason) |
164 | { | 164 | { |
165 | if (destination == null) | 165 | if (destination == null) |
166 | { | 166 | { |
@@ -170,27 +170,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
170 | } | 170 | } |
171 | 171 | ||
172 | // Try local first | 172 | // Try local first |
173 | if (m_localBackend.CreateAgent(source, destination, aCircuit, teleportFlags, out reason)) | 173 | if (m_localBackend.CreateAgent(source, destination, aCircuit, teleportFlags, ctx, out reason)) |
174 | return true; | 174 | return true; |
175 | 175 | ||
176 | // else do the remote thing | 176 | // else do the remote thing |
177 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) | 177 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
178 | { | 178 | { |
179 | return m_remoteConnector.CreateAgent(source, destination, aCircuit, teleportFlags, out reason); | 179 | return m_remoteConnector.CreateAgent(source, destination, aCircuit, teleportFlags, ctx, out reason); |
180 | } | 180 | } |
181 | return false; | 181 | return false; |
182 | } | 182 | } |
183 | 183 | ||
184 | public bool UpdateAgent(GridRegion destination, AgentData cAgentData) | 184 | public bool UpdateAgent(GridRegion destination, AgentData cAgentData, EntityTransferContext ctx) |
185 | { | 185 | { |
186 | if (destination == null) | 186 | if (destination == null) |
187 | return false; | 187 | return false; |
188 | 188 | ||
189 | // Try local first | 189 | // Try local first |
190 | if (m_localBackend.IsLocalRegion(destination.RegionID)) | 190 | if (m_localBackend.IsLocalRegion(destination.RegionID)) |
191 | return m_localBackend.UpdateAgent(destination, cAgentData); | 191 | return m_localBackend.UpdateAgent(destination, cAgentData, ctx); |
192 | 192 | ||
193 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | 193 | return m_remoteConnector.UpdateAgent(destination, cAgentData, ctx); |
194 | } | 194 | } |
195 | 195 | ||
196 | public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData) | 196 | public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData) |
@@ -236,7 +236,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
236 | return false; | 236 | return false; |
237 | } | 237 | } |
238 | 238 | ||
239 | |||
240 | public bool CloseAgent(GridRegion destination, UUID id, string auth_token) | 239 | public bool CloseAgent(GridRegion destination, UUID id, string auth_token) |
241 | { | 240 | { |
242 | if (destination == null) | 241 | if (destination == null) |
@@ -249,7 +248,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
249 | // else do the remote thing | 248 | // else do the remote thing |
250 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) | 249 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
251 | return m_remoteConnector.CloseAgent(destination, id, auth_token); | 250 | return m_remoteConnector.CloseAgent(destination, id, auth_token); |
252 | 251 | ||
253 | return false; | 252 | return false; |
254 | } | 253 | } |
255 | 254 | ||