aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-25 01:41:00 +0100
committerJustin Clark-Casey (justincc)2012-05-25 01:41:00 +0100
commit7cceab12956dcb8ebeff129375888541831f7976 (patch)
tree650baa934c0da9d18273fccd16f344d12bf07a72 /OpenSim/Services/Connectors
parentDon't actually proceed on a within-region teleport if another is already taki... (diff)
downloadopensim-SC_OLD-7cceab12956dcb8ebeff129375888541831f7976.zip
opensim-SC_OLD-7cceab12956dcb8ebeff129375888541831f7976.tar.gz
opensim-SC_OLD-7cceab12956dcb8ebeff129375888541831f7976.tar.bz2
opensim-SC_OLD-7cceab12956dcb8ebeff129375888541831f7976.tar.xz
In remote QueryAccess, also receive the actual status (true|false) instead of always true no matter what the callee actually returned.
This was due to two things 1) SimulationServiceConnector.QueryAccess was always looking to the outer result["success"]. But if a "_Result" map is returned (which is certainly the case right now), then the true success is _Result["success"], result["success"] is always true no matter what 2) If QueryAccess was false at the destination, then AgentHandlers.DoQueryAccess() was never putting this in the result. The default action of SerializeJsonString() is not to put false booleans in the JSON!!!, so this has to be explicitly set.
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index cc46ba8..032beb5 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -320,6 +320,10 @@ namespace OpenSim.Services.Connectors.Simulation
320 { 320 {
321 OSDMap data = (OSDMap)result["_Result"]; 321 OSDMap data = (OSDMap)result["_Result"];
322 322
323 // FIXME: If there is a _Result map then it's the success key here that indicates the true success
324 // or failure, not the sibling result node.
325 success = data["success"];
326
323 reason = data["reason"].AsString(); 327 reason = data["reason"].AsString();
324 if (data["version"] != null && data["version"].AsString() != string.Empty) 328 if (data["version"] != null && data["version"].AsString() != string.Empty)
325 version = data["version"].AsString(); 329 version = data["version"].AsString();