diff options
| author | Melanie | 2009-09-06 04:29:21 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-06 04:29:21 +0100 |
| commit | 2303945b4e664cf81fc9a8eaa3c975cdda464b53 (patch) | |
| tree | 09871a6288a382d01a276c1e30bb2f6a41af6ae1 /OpenSim/Region | |
| parent | Revising the user account data interfaces. No user functionality yet (diff) | |
| parent | uh-hum. It might help if I remembered to save the file. (diff) | |
| download | opensim-SC_OLD-2303945b4e664cf81fc9a8eaa3c975cdda464b53.zip opensim-SC_OLD-2303945b4e664cf81fc9a8eaa3c975cdda464b53.tar.gz opensim-SC_OLD-2303945b4e664cf81fc9a8eaa3c975cdda464b53.tar.bz2 opensim-SC_OLD-2303945b4e664cf81fc9a8eaa3c975cdda464b53.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs | 2 |
2 files changed, 2 insertions, 2 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 | { |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs index 92e6ae3..ec8512a 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs | |||
| @@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
| 112 | parameters.Add(param); | 112 | parameters.Add(param); |
| 113 | XmlRpcRequest req = new XmlRpcRequest("get_agent_by_uuid", parameters); | 113 | XmlRpcRequest req = new XmlRpcRequest("get_agent_by_uuid", parameters); |
| 114 | 114 | ||
| 115 | XmlRpcResponse resp = req.Send(GetUserServerURL(userId), 6000); | 115 | XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 6000); |
| 116 | Hashtable respData = (Hashtable)resp.Value; | 116 | Hashtable respData = (Hashtable)resp.Value; |
| 117 | if (respData.Contains("error_type")) | 117 | if (respData.Contains("error_type")) |
| 118 | { | 118 | { |