diff options
author | Diva Canto | 2013-07-13 17:56:42 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-13 17:56:42 -0700 |
commit | 931eb892d92bcd61194655ec02def6264d8b182e (patch) | |
tree | da7914320be0d075b0fb1df7db256feb186bcff3 /OpenSim/Services | |
parent | Gatekeeper: stop bogus agents earlier, here at the Gatekeeper. No need to bot... (diff) | |
download | opensim-SC_OLD-931eb892d92bcd61194655ec02def6264d8b182e.zip opensim-SC_OLD-931eb892d92bcd61194655ec02def6264d8b182e.tar.gz opensim-SC_OLD-931eb892d92bcd61194655ec02def6264d8b182e.tar.bz2 opensim-SC_OLD-931eb892d92bcd61194655ec02def6264d8b182e.tar.xz |
Deleted GET agent all around. Not used.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 35 | ||||
-rw-r--r-- | OpenSim/Services/Interfaces/ISimulationService.cs | 2 |
2 files changed, 0 insertions, 37 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index f51c809..7eb8c24 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -271,41 +271,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
271 | return false; | 271 | return false; |
272 | } | 272 | } |
273 | 273 | ||
274 | /// <summary> | ||
275 | /// Not sure what sequence causes this function to be invoked. The only calling | ||
276 | /// path is through the GET method | ||
277 | /// </summary> | ||
278 | public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent) | ||
279 | { | ||
280 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: RetrieveAgent start"); | ||
281 | |||
282 | agent = null; | ||
283 | |||
284 | // Eventually, we want to use a caps url instead of the agentID | ||
285 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | ||
286 | |||
287 | try | ||
288 | { | ||
289 | OSDMap result = WebUtil.GetFromService(uri, 10000); | ||
290 | if (result["Success"].AsBoolean()) | ||
291 | { | ||
292 | // OSDMap args = Util.GetOSDMap(result["_RawResult"].AsString()); | ||
293 | OSDMap args = (OSDMap)result["_Result"]; | ||
294 | if (args != null) | ||
295 | { | ||
296 | agent = new CompleteAgentData(); | ||
297 | agent.Unpack(args, null); | ||
298 | return true; | ||
299 | } | ||
300 | } | ||
301 | } | ||
302 | catch (Exception e) | ||
303 | { | ||
304 | m_log.Warn("[REMOTE SIMULATION CONNECTOR]: UpdateAgent failed with exception: " + e.ToString()); | ||
305 | } | ||
306 | |||
307 | return false; | ||
308 | } | ||
309 | 274 | ||
310 | /// <summary> | 275 | /// <summary> |
311 | /// </summary> | 276 | /// </summary> |
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index b10a85c..c9cbd1a 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs | |||
@@ -75,8 +75,6 @@ namespace OpenSim.Services.Interfaces | |||
75 | /// <returns></returns> | 75 | /// <returns></returns> |
76 | bool UpdateAgent(GridRegion destination, AgentPosition data); | 76 | bool UpdateAgent(GridRegion destination, AgentPosition data); |
77 | 77 | ||
78 | bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent); | ||
79 | |||
80 | bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason); | 78 | bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason); |
81 | 79 | ||
82 | /// <summary> | 80 | /// <summary> |