diff options
| author | Melanie | 2013-04-04 03:17:57 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-04 03:17:57 +0100 |
| commit | 6a5f6ac04e2967c73b4ebab20315c4c84954b53a (patch) | |
| tree | faf2660e9e34e163899dac4ed98fe97df20d08fe | |
| parent | Merge commit 'f281a994e8544d95961ef669a0fe14c0cba7f175' into careminster (diff) | |
| parent | Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last u... (diff) | |
| download | opensim-SC-6a5f6ac04e2967c73b4ebab20315c4c84954b53a.zip opensim-SC-6a5f6ac04e2967c73b4ebab20315c4c84954b53a.tar.gz opensim-SC-6a5f6ac04e2967c73b4ebab20315c4c84954b53a.tar.bz2 opensim-SC-6a5f6ac04e2967c73b4ebab20315c4c84954b53a.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index e50dac6..f1b59bb 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -1225,7 +1225,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1225 | { | 1225 | { |
| 1226 | GridUserInfo userInfo = m_application.SceneManager.CurrentOrFirstScene.GridUserService.GetGridUserInfo(account.PrincipalID.ToString()); | 1226 | GridUserInfo userInfo = m_application.SceneManager.CurrentOrFirstScene.GridUserService.GetGridUserInfo(account.PrincipalID.ToString()); |
| 1227 | if (userInfo != null) | 1227 | if (userInfo != null) |
| 1228 | responseData["lastlogin"] = userInfo.Login; | 1228 | responseData["lastlogin"] = Util.ToUnixTime(userInfo.Login); |
| 1229 | else | 1229 | else |
| 1230 | responseData["lastlogin"] = 0; | 1230 | responseData["lastlogin"] = 0; |
| 1231 | 1231 | ||