OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

remotes/origin/0.6.7-post-fixes
Melanie 2009-09-06 04:29:21 +01:00
parent 2a8f66b221 babe392709
commit 2303945b4e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
View File

@ -313,7 +313,7 @@ namespace OpenSim.Region.Communications.Hypergrid
public bool IsForeignUser(UUID userID, out string userServerURL) public bool IsForeignUser(UUID userID, out string userServerURL)
{ {
userServerURL = string.Empty; userServerURL = m_commsManager.NetworkServersInfo.UserURL;
CachedUserInfo uinfo = m_commsManager.UserProfileCacheService.GetUserDetails(userID); CachedUserInfo uinfo = m_commsManager.UserProfileCacheService.GetUserDetails(userID);
if (uinfo != null) if (uinfo != null)
{ {

2
OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
View File

@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.OGS1
parameters.Add(param); parameters.Add(param);
XmlRpcRequest req = new XmlRpcRequest("get_agent_by_uuid", parameters); 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; Hashtable respData = (Hashtable)resp.Value;
if (respData.Contains("error_type")) if (respData.Contains("error_type"))
{ {