diff options
author | Melanie Thielker | 2015-11-01 19:11:14 +0100 |
---|---|---|
committer | Melanie Thielker | 2015-11-01 19:11:14 +0100 |
commit | 69585a4824a7814bbe543d624de6c3627e0b927b (patch) | |
tree | 5d4bb6480906000f019c0d456939b24f5dfd8ab4 /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
parent | Merge branch 'master' into avinationmerge (diff) | |
download | opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.zip opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.tar.gz opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.tar.bz2 opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.tar.xz |
More plumbing of the EntityTransferContext (not yet complete)
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 6cb15f6..3755650 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -185,7 +185,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
185 | * Agent-related communications | 185 | * Agent-related communications |
186 | */ | 186 | */ |
187 | 187 | ||
188 | public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) | 188 | public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, EntityTransferContext ctx, out string reason) |
189 | { | 189 | { |
190 | if (destination == null) | 190 | if (destination == null) |
191 | { | 191 | { |
@@ -204,7 +204,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
204 | return false; | 204 | return false; |
205 | } | 205 | } |
206 | 206 | ||
207 | public bool UpdateAgent(GridRegion destination, AgentData cAgentData) | 207 | public bool UpdateAgent(GridRegion destination, AgentData cAgentData, EntityTransferContext ctx) |
208 | { | 208 | { |
209 | if (destination == null) | 209 | if (destination == null) |
210 | return false; | 210 | return false; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index cf19edd..0ebdbce 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -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) |