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

clear merge issue

avinationmerge
UbitUmarov 2015-09-28 15:21:23 +01:00
parent 93af984e94
commit c4ef8984a3
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -323,12 +323,6 @@ namespace OpenSim.Services.LLLoginService
return LLFailedLoginResponse.UserProblem; return LLFailedLoginResponse.UserProblem;
} }
if (account.UserLevel < 0)
{
m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: Unverified account");
return LLFailedLoginResponse.UnverifiedAccountProblem;
}
if (account.UserLevel < m_MinLoginLevel) if (account.UserLevel < m_MinLoginLevel)
{ {
m_log.InfoFormat( m_log.InfoFormat(
@ -530,7 +524,7 @@ namespace OpenSim.Services.LLLoginService
LLLoginResponse response LLLoginResponse response
= new LLLoginResponse( = new LLLoginResponse(
account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, where, startLocation, position, lookAt, gestures, processedMessage, home, clientIP,
m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
m_DestinationGuide, m_AvatarPicker, realID, m_ClassifiedFee,m_MaxAgentGroups); m_DestinationGuide, m_AvatarPicker, realID, m_ClassifiedFee,m_MaxAgentGroups);