Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge

Conflicts:
	OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
This commit is contained in:
Melanie
2011-10-25 03:26:09 +01:00
9 changed files with 192 additions and 5 deletions

View File

@@ -158,7 +158,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
return m_AuthenticationService.SetPassword(principalID, passwd);
}
#endregion
public AuthInfo GetAuthInfo(UUID principalID)
{
return m_AuthenticationService.GetAuthInfo(principalID);
}
public bool SetAuthInfo(AuthInfo info)
{
return m_AuthenticationService.SetAuthInfo(info);
}
#endregion
}
}