diff options
author | Diva Canto | 2013-07-13 21:28:46 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-13 21:28:46 -0700 |
commit | b4f1b9acf65f9e782d56602e60c58be6145c5cca (patch) | |
tree | 33860eecce915dedd2c573f2d3aad026e63706bc /OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation | |
parent | Deleted GET agent all around. Not used. (diff) | |
download | opensim-SC_OLD-b4f1b9acf65f9e782d56602e60c58be6145c5cca.zip opensim-SC_OLD-b4f1b9acf65f9e782d56602e60c58be6145c5cca.tar.gz opensim-SC_OLD-b4f1b9acf65f9e782d56602e60c58be6145c5cca.tar.bz2 opensim-SC_OLD-b4f1b9acf65f9e782d56602e60c58be6145c5cca.tar.xz |
Guard against unauthorized agent deletes.
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 2dc3d2a..6d5039b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -286,7 +286,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
286 | return false; | 286 | return false; |
287 | } | 287 | } |
288 | 288 | ||
289 | public bool CloseAgent(GridRegion destination, UUID id) | 289 | public bool CloseAgent(GridRegion destination, UUID id, string auth_token) |
290 | { | 290 | { |
291 | if (destination == null) | 291 | if (destination == null) |
292 | return false; | 292 | return false; |
@@ -297,7 +297,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
297 | // "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate", | 297 | // "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate", |
298 | // s.RegionInfo.RegionName, destination.RegionHandle); | 298 | // s.RegionInfo.RegionName, destination.RegionHandle); |
299 | 299 | ||
300 | m_scenes[destination.RegionID].IncomingCloseAgent(id, false); | 300 | m_scenes[destination.RegionID].IncomingCloseAgent(id, false, auth_token); |
301 | return true; | 301 | return true; |
302 | } | 302 | } |
303 | 303 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index 4aa2d2a..8722b80 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -245,18 +245,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
245 | } | 245 | } |
246 | 246 | ||
247 | 247 | ||
248 | public bool CloseAgent(GridRegion destination, UUID id) | 248 | public bool CloseAgent(GridRegion destination, UUID id, string auth_token) |
249 | { | 249 | { |
250 | if (destination == null) | 250 | if (destination == null) |
251 | return false; | 251 | return false; |
252 | 252 | ||
253 | // Try local first | 253 | // Try local first |
254 | if (m_localBackend.CloseAgent(destination, id)) | 254 | if (m_localBackend.CloseAgent(destination, id, auth_token)) |
255 | return true; | 255 | return true; |
256 | 256 | ||
257 | // else do the remote thing | 257 | // else do the remote thing |
258 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) | 258 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
259 | return m_remoteConnector.CloseAgent(destination, id); | 259 | return m_remoteConnector.CloseAgent(destination, id, auth_token); |
260 | 260 | ||
261 | return false; | 261 | return false; |
262 | } | 262 | } |