Fix bug where a failed QueryAccess to a remove region would always have the reason "Communications failure" no matter what the destination region actually returned

1 files changed, 20 insertions, 13 deletions

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 032beb5..95c4f87 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -328,25 +328,32 @@ namespace OpenSim.Services.Connectors.Simulation
                     if (data["version"] != null && data["version"].AsString() != string.Empty)
                         version = data["version"].AsString();
 
-                    m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1} version {2} ({3})", uri, success, version, data["version"].AsString());
+                    m_log.DebugFormat(
+                        "[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}, reason {2}, version {3} ({4})",
+                        uri, success, reason, version, data["version"].AsString());
                 }
 
                 if (!success)
                 {
-                    if (result.ContainsKey("Message"))
+                    // If we don't check this then OpenSimulator 0.7.3.1 and some period before will never see the
+                    // actual failure message
+                    if (!result.ContainsKey("_Result"))
                     {
-                        string message = result["Message"].AsString();
-                        if (message == "Service request failed: [MethodNotAllowed] MethodNotAllowed") // Old style region
+                        if (result.ContainsKey("Message"))
                         {
-                            m_log.Info("[REMOTE SIMULATION CONNECTOR]: The above web util error was caused by a TP to a sim that doesn't support QUERYACCESS and can be ignored");
-                            return true;
+                            string message = result["Message"].AsString();
+                            if (message == "Service request failed: [MethodNotAllowed] MethodNotAllowed") // Old style region
+                            {
+                                m_log.Info("[REMOTE SIMULATION CONNECTOR]: The above web util error was caused by a TP to a sim that doesn't support QUERYACCESS and can be ignored");
+                                return true;
+                            }
+    
+                            reason = result["Message"];
+                        }
+                        else
+                        {
+                            reason = "Communications failure";
                         }
-
-                        reason = result["Message"];
-                    }
-                    else
-                    {
-                        reason = "Communications failure";
                     }
 
                     return false;
@@ -356,7 +363,7 @@ namespace OpenSim.Services.Connectors.Simulation
             }
             catch (Exception e)
             {
-                m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] QueryAcess failed with exception; {0}",e.ToString());
+                m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] QueryAcesss failed with exception; {0}",e.ToString());
             }
             
             return false;