aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-08-03 16:27:11 -0700
committerDiva Canto2010-08-03 16:28:06 -0700
commita46538485bbcefc6563fc15048497e17971f49a6 (patch)
tree84683bdffd979bff297e6ba2b55e7c90afe245e4 /OpenSim
parentBug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, but... (diff)
downloadopensim-SC_OLD-a46538485bbcefc6563fc15048497e17971f49a6.zip
opensim-SC_OLD-a46538485bbcefc6563fc15048497e17971f49a6.tar.gz
opensim-SC_OLD-a46538485bbcefc6563fc15048497e17971f49a6.tar.bz2
opensim-SC_OLD-a46538485bbcefc6563fc15048497e17971f49a6.tar.xz
One more thing related to the previous commit. Must avoid all in-process remote calls.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs25
1 files changed, 15 insertions, 10 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 3fc9327..82543ab 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -283,18 +283,23 @@ namespace OpenSim.Services.HypergridService
283 return false; 283 return false;
284 } 284 }
285 285
286 Object[] args = new Object[] { userURL }; 286 if (userURL == m_ExternalName)
287 IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); //ServerUtils.LoadPlugin<IUserAgentService>(m_AuthDll, args); 287 m_UserAgentService.VerifyAgent(aCircuit.SecureSessionID, aCircuit.ServiceSessionID);
288 if (userAgentService != null) 288 else
289 { 289 {
290 try 290 Object[] args = new Object[] { userURL };
291 IUserAgentService userAgentService = new UserAgentServiceConnector(userURL);
292 if (userAgentService != null)
291 { 293 {
292 return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); 294 try
293 } 295 {
294 catch 296 return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
295 { 297 }
296 m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL); 298 catch
297 return false; 299 {
300 m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
301 return false;
302 }
298 } 303 }
299 } 304 }
300 305