Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs

1 files changed, 10 insertions, 11 deletions

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 9385b8d..e26383f 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -335,22 +335,21 @@ namespace OpenSim.Services.HypergridService
             }
 
             if (userURL == m_ExternalName)
+            {
                 return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
+            }
             else
             {
-//                Object[] args = new Object[] { userURL };
                 IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); 
-                if (userAgentService != null)
+
+                try
                 {
-                    try
-                    {
-                        return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
-                    }
-                    catch
-                    {
-                        m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
-                        return false;
-                    }
+                    return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
+                }
+                catch
+                {
+                    m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
+                    return false;
                 }
             }