aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorMelanie2010-05-09 17:04:23 +0100
committerMelanie2010-05-09 17:04:23 +0100
commit4e0d62547d2760ce48cf64373917dcfb893da543 (patch)
tree9f84ddc57b58ed107cd6d610aaeb62039d483a71 /OpenSim/ApplicationPlugins
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentAdd a field asset_flags and a corresponding enum to the asset database. This (diff)
downloadopensim-SC_OLD-4e0d62547d2760ce48cf64373917dcfb893da543.zip
opensim-SC_OLD-4e0d62547d2760ce48cf64373917dcfb893da543.tar.gz
opensim-SC_OLD-4e0d62547d2760ce48cf64373917dcfb893da543.tar.bz2
opensim-SC_OLD-4e0d62547d2760ce48cf64373917dcfb893da543.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 6da5558..d7904a6 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1237,9 +1237,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1237 } 1237 }
1238 else 1238 else
1239 { 1239 {
1240 PresenceInfo[] pinfos = m_app.SceneManager.CurrentOrFirstScene.PresenceService.GetAgents(new string[] { account.PrincipalID.ToString() }); 1240 GridUserInfo guinfo = m_app.SceneManager.CurrentOrFirstScene.GridUserService.GetGridUserInfo(account.PrincipalID.ToString());
1241 if (pinfos != null && pinfos.Length >= 1) 1241 if (guinfo != null)
1242 responseData["lastlogin"] = pinfos[0].Login; 1242 responseData["lastlogin"] = guinfo.Login;
1243 else 1243 else
1244 responseData["lastlogin"] = 0; 1244 responseData["lastlogin"] = 0;
1245 1245