From 7d9d8eb90f1aae353e6e0a649875a9506892a6cc Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 5 Sep 2009 16:56:33 -0700 Subject: [PATCH 1/2] This should get rid of the infinite loop upon looking up users/agents by UUID in grid mode. Grr. --- OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs index aaa1c789fb..f1a56ef64c 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs @@ -313,7 +313,7 @@ namespace OpenSim.Region.Communications.Hypergrid public bool IsForeignUser(UUID userID, out string userServerURL) { - userServerURL = string.Empty; + userServerURL = m_commsManager.NetworkServersInfo.UserURL; CachedUserInfo uinfo = m_commsManager.UserProfileCacheService.GetUserDetails(userID); if (uinfo != null) { From babe392709a7f7a65540485a641916d6e0194b5d Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 5 Sep 2009 17:16:43 -0700 Subject: [PATCH 2/2] uh-hum. It might help if I remembered to save the file. --- OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs index 92e6ae31d6..ec8512aff8 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs @@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.OGS1 parameters.Add(param); XmlRpcRequest req = new XmlRpcRequest("get_agent_by_uuid", parameters); - XmlRpcResponse resp = req.Send(GetUserServerURL(userId), 6000); + XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 6000); Hashtable respData = (Hashtable)resp.Value; if (respData.Contains("error_type")) {