aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-09-05 16:56:33 -0700
committerDiva Canto2009-09-05 16:56:33 -0700
commit7d9d8eb90f1aae353e6e0a649875a9506892a6cc (patch)
treefe577234d4078da780773bac3bd4e45d377ad357
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-7d9d8eb90f1aae353e6e0a649875a9506892a6cc.zip
opensim-SC_OLD-7d9d8eb90f1aae353e6e0a649875a9506892a6cc.tar.gz
opensim-SC_OLD-7d9d8eb90f1aae353e6e0a649875a9506892a6cc.tar.bz2
opensim-SC_OLD-7d9d8eb90f1aae353e6e0a649875a9506892a6cc.tar.xz
This should get rid of the infinite loop upon looking up users/agents by UUID in grid mode. Grr.
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index aaa1c78..f1a56ef 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -313,7 +313,7 @@ namespace OpenSim.Region.Communications.Hypergrid
313 313
314 public bool IsForeignUser(UUID userID, out string userServerURL) 314 public bool IsForeignUser(UUID userID, out string userServerURL)
315 { 315 {
316 userServerURL = string.Empty; 316 userServerURL = m_commsManager.NetworkServersInfo.UserURL;
317 CachedUserInfo uinfo = m_commsManager.UserProfileCacheService.GetUserDetails(userID); 317 CachedUserInfo uinfo = m_commsManager.UserProfileCacheService.GetUserDetails(userID);
318 if (uinfo != null) 318 if (uinfo != null)
319 { 319 {