aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation
diff options
context:
space:
mode:
authorMelanie2011-02-19 01:59:49 +0000
committerMelanie2011-02-19 01:59:49 +0000
commit4834b476798cce715d0b5b286a6f20bc577bdabd (patch)
tree5bf15fa7978daaff116147838f84e4915bca1777 /OpenSim/Services/Connectors/Simulation
parentAdd needed dummy to sample money (diff)
parentRemove test T020_TestMakeRootAgent() which hasn't been active for ages anyway (diff)
downloadopensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.zip
opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.gz
opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.bz2
opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 98f72f0..3c5ecc5 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -185,7 +185,7 @@ namespace OpenSim.Services.Connectors.Simulation
185 } 185 }
186 186
187 // unreachable 187 // unreachable
188 return true; 188// return true;
189 } 189 }
190 190
191 /// <summary> 191 /// <summary>
@@ -274,7 +274,11 @@ namespace OpenSim.Services.Connectors.Simulation
274 try 274 try
275 { 275 {
276 OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000); 276 OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000);
277 bool success = result["Success"].AsBoolean(); 277 bool success = result["success"].AsBoolean();
278 reason = result["reason"].AsString();
279
280 //m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}", uri, success);
281
278 if (!success) 282 if (!success)
279 { 283 {
280 if (result.ContainsKey("Message")) 284 if (result.ContainsKey("Message"))