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

slimupdates
Justin Clark-Casey (justincc) 2010-03-26 19:57:11 +00:00
commit 24ca202dab
1 changed files with 3 additions and 2 deletions

View File

@ -1193,8 +1193,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
else else
{ {
string domain = string.Empty; //m_sceneList[0].CommsManager.NetworkServersInfo.UserURL; string domain = string.Empty; //m_sceneList[0].CommsManager.NetworkServersInfo.UserURL;
if (account.ServiceURLs["HomeURI"] != null) object homeUriObj;
domain = account.ServiceURLs["HomeURI"].ToString(); if (account.ServiceURLs.TryGetValue("HomeURI", out homeUriObj) && homeUriObj != null)
domain = homeUriObj.ToString();
// They're a local user, use this: // They're a local user, use this:
info.RequestID.UserServiceURL = domain; info.RequestID.UserServiceURL = domain;
} }