Merge branch 'master' into careminster

avinationmerge
Melanie 2013-04-04 03:17:57 +01:00
commit 6a5f6ac04e
1 changed files with 1 additions and 1 deletions

View File

@ -1225,7 +1225,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
{ {
GridUserInfo userInfo = m_application.SceneManager.CurrentOrFirstScene.GridUserService.GetGridUserInfo(account.PrincipalID.ToString()); GridUserInfo userInfo = m_application.SceneManager.CurrentOrFirstScene.GridUserService.GetGridUserInfo(account.PrincipalID.ToString());
if (userInfo != null) if (userInfo != null)
responseData["lastlogin"] = userInfo.Login; responseData["lastlogin"] = Util.ToUnixTime(userInfo.Login);
else else
responseData["lastlogin"] = 0; responseData["lastlogin"] = 0;