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

Fixed logic for sending foreign user information (HG).

0.6.2-post-fixes
diva 2009-01-03 16:18:20 +00:00
parent 711cd752ad
commit f1b9ff6b4b
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
View File

@ -893,20 +893,31 @@ namespace OpenSim.Region.Communications.Hypergrid
public bool SendUserInformation(RegionInfo regInfo, AgentCircuitData agentData) public bool SendUserInformation(RegionInfo regInfo, AgentCircuitData agentData)
{ {
CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID); CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID);
if ((uinfo == null) || !IsGoingHome(uinfo, regInfo))
if ((IsLocalUser(uinfo) && IsHyperlinkRegion(regInfo.RegionHandle)) ||
(!IsLocalUser(uinfo) && !IsGoingHome(uinfo, regInfo)))
{ {
m_log.Info("[HGrid]: User seems to be going to foreign region " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName); m_log.Info("[HGrid]: Local user is going to foreign region or foreign user is going elsewhere");
if (!InformRegionOfUser(regInfo, agentData)) if (!InformRegionOfUser(regInfo, agentData))
{ {
m_log.Warn("[HGrid]: Could not inform remote region of transferring user."); m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
return false; return false;
} }
} }
else //if ((uinfo == null) || !IsGoingHome(uinfo, regInfo))
m_log.Info("[HGrid]: User seems to be going home " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName); //{
// m_log.Info("[HGrid]: User seems to be going to foreign region.");
// if (!InformRegionOfUser(regInfo, agentData))
// {
// m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
// return false;
// }
//}
//else
// m_log.Info("[HGrid]: User seems to be going home " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName);
// May need to change agent's name // May need to change agent's name
if (IsLocalUser(uinfo)) if (IsLocalUser(uinfo) && IsHyperlinkRegion(regInfo.RegionHandle))
{ {
agentData.firstname = agentData.firstname + "." + agentData.lastname; agentData.firstname = agentData.firstname + "." + agentData.lastname;
agentData.lastname = "@" + serversInfo.UserURL.Replace("http://", ""); ; //HGNetworkServersInfo.Singleton.LocalUserServerURI; agentData.lastname = "@" + serversInfo.UserURL.Replace("http://", ""); ; //HGNetworkServersInfo.Singleton.LocalUserServerURI;