ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

move servicesGodAgentID to Constants.cs

Browse Source
This commit is contained in:
UbitUmarov
2020-12-25 22:48:42 +00:00
parent 696a7a4edc
commit a0d0bbacb2
7 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@@ -365,6 +365,12 @@ namespace OpenSim.Services.LLLoginService
return LLFailedLoginResponse.LoginBlockedProblem;
}
if (account.PrincipalID == Constants.servicesGodAgentID)
{
// really?
return LLFailedLoginResponse.UserProblem;
}
// If a scope id is requested, check that the account is in
// that scope, or unscoped.
//
@@ -399,11 +405,7 @@ namespace OpenSim.Services.LLLoginService
return LLFailedLoginResponse.UserProblem;
}
if(account.PrincipalID == new UUID("6571e388-6218-4574-87db-f9379718315e"))
{
// really?
return LLFailedLoginResponse.UserProblem;
}
string PrincipalIDstr = account.PrincipalID.ToString();
GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(PrincipalIDstr);
@@ -1143,14 +1145,13 @@ namespace OpenSim.Services.LLLoginService
return false;
string regURL = regInfo.ServerURI;
if(String.IsNullOrEmpty(regURL))
if(string.IsNullOrEmpty(regURL))
return false;
UUID guuid = new UUID("6571e388-6218-4574-87db-f9379718315e");
GridInstantMessage msg = new GridInstantMessage();
msg.imSessionID = UUID.Zero.Guid;
msg.fromAgentID = guuid.Guid;
msg.fromAgentID = Constants.servicesGodAgentID.Guid;
msg.toAgentID = agentID.Guid;
msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
msg.fromAgentName = "GRID";