diff options
author | Oren Hurvitz | 2014-04-24 14:19:03 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-24 15:58:41 +0100 |
commit | d15a3b10a3031b9552d67d2e2d435a689b448e2f (patch) | |
tree | 647c987c479a475ab247784cedef12779e92e7ff /OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |
parent | Fixed: hypergrid-linking stopped accepting the following format: "http://grid... (diff) | |
download | opensim-SC_OLD-d15a3b10a3031b9552d67d2e2d435a689b448e2f.zip opensim-SC_OLD-d15a3b10a3031b9552d67d2e2d435a689b448e2f.tar.gz opensim-SC_OLD-d15a3b10a3031b9552d67d2e2d435a689b448e2f.tar.bz2 opensim-SC_OLD-d15a3b10a3031b9552d67d2e2d435a689b448e2f.tar.xz |
When sending JSON-RPC calls (for UserProfile), use WebUtil instead of constructing the HTTP requests manually. This allows the calls to be logged when using "debug http all 6".
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index a5520c4..d9fe5a0 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -136,7 +136,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
136 | } | 136 | } |
137 | 137 | ||
138 | // Try the old version, uncompressed | 138 | // Try the old version, uncompressed |
139 | result = WebUtil.PostToService(uri, args, 30000); | 139 | result = WebUtil.PostToService(uri, args, 30000, false); |
140 | 140 | ||
141 | if (result["Success"].AsBoolean()) | 141 | if (result["Success"].AsBoolean()) |
142 | { | 142 | { |
@@ -302,7 +302,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
302 | 302 | ||
303 | try | 303 | try |
304 | { | 304 | { |
305 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 30000, false); | 305 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 30000, false, false); |
306 | bool success = result["success"].AsBoolean(); | 306 | bool success = result["success"].AsBoolean(); |
307 | if (result.ContainsKey("_Result")) | 307 | if (result.ContainsKey("_Result")) |
308 | { | 308 | { |
@@ -365,7 +365,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
365 | 365 | ||
366 | try | 366 | try |
367 | { | 367 | { |
368 | WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false); | 368 | WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false, false); |
369 | } | 369 | } |
370 | catch (Exception e) | 370 | catch (Exception e) |
371 | { | 371 | { |
@@ -384,7 +384,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
384 | 384 | ||
385 | try | 385 | try |
386 | { | 386 | { |
387 | WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false); | 387 | WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false, false); |
388 | } | 388 | } |
389 | catch (Exception e) | 389 | catch (Exception e) |
390 | { | 390 | { |
@@ -431,7 +431,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
431 | args["destination_name"] = OSD.FromString(destination.RegionName); | 431 | args["destination_name"] = OSD.FromString(destination.RegionName); |
432 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 432 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
433 | 433 | ||
434 | OSDMap result = WebUtil.PostToService(uri, args, 40000); | 434 | OSDMap result = WebUtil.PostToService(uri, args, 40000, false); |
435 | 435 | ||
436 | if (result == null) | 436 | if (result == null) |
437 | return false; | 437 | return false; |