2 files changed, 75 insertions, 43 deletions

diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs
index 4da7233..07641ef 100644
--- a/OpenSim/Addons/Groups/Service/GroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsService.cs
@@ -307,6 +307,21 @@ namespace OpenSim.Groups
                 m.Contribution = Int32.Parse(d.Data["Contribution"]);
                 m.ListInProfile = d.Data["ListInProfile"] == "1" ? true : false;
 
+                                GridUserData gud = m_GridUserService.Get(d.PrincipalID);
+                                if (gud != null)
+                                {
+                                        if (bool.Parse(gud.Data["Online"])) 
+                                        {
+                                                m.OnlineStatus = @"Online";
+                                        }
+                                        else 
+                                        {
+                                                int unixtime = int.Parse(gud.Data["Login"]);
+                                                // The viewer is very picky about how these strings are formed. Eg. it will crash on malformed dates!
+                                                m.OnlineStatus = (unixtime == 0) ? @"unknown" : Util.ToDateTime(unixtime).ToString("MM/dd/yyyy");
+                                        }
+                                }
+
                 // Is this person an owner of the group?
                 m.IsOwner = (rolemembershipsList.Find(r => r.RoleID == ownerRoleID) != null) ? true : false;
 
diff --git a/OpenSim/Addons/Groups/Service/GroupsServiceBase.cs b/OpenSim/Addons/Groups/Service/GroupsServiceBase.cs
index 2611a3d..8e237aa 100644
--- a/OpenSim/Addons/Groups/Service/GroupsServiceBase.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsServiceBase.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -35,50 +35,67 @@ using OpenSim.Services.Base;
 
 namespace OpenSim.Groups
 {
-    public class GroupsServiceBase : ServiceBase
-    {
-        protected IGroupsData m_Database = null;
+        public class GroupsServiceBase : ServiceBase
+        {
+                protected IGroupsData m_Database = null;
+                protected IGridUserData m_GridUserService = null;
 
-        public GroupsServiceBase(IConfigSource config, string cName)
-            : base(config)
-        {
-            string dllName = String.Empty;
-            string connString = String.Empty;
-            string realm = "os_groups";
-            string configName = (cName == string.Empty) ? "Groups" : cName;
+                public GroupsServiceBase(IConfigSource config, string cName)
+                        : base(config)
+                {
+                        string dllName = String.Empty;
+                        string connString = String.Empty;
+                        string realm = "os_groups";
+                        string usersRealm = "GridUser";
+                        string configName = (cName == string.Empty) ? "Groups" : cName;
 
-            //
-            // Try reading the [DatabaseService] section, if it exists
-            //
-            IConfig dbConfig = config.Configs["DatabaseService"];
-            if (dbConfig != null)
-            {
-                if (dllName == String.Empty)
-                    dllName = dbConfig.GetString("StorageProvider", String.Empty);
-                if (connString == String.Empty)
-                    connString = dbConfig.GetString("ConnectionString", String.Empty);
-            }
+                        //
+                        // Try reading the [DatabaseService] section, if it exists
+                        //
+                        IConfig dbConfig = config.Configs["DatabaseService"];
+                        if (dbConfig != null)
+                        {
+                                if (dllName == String.Empty)
+                                        dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                                if (connString == String.Empty)
+                                        connString = dbConfig.GetString("ConnectionString", String.Empty);
+                        }
 
-            //
-            // [Groups] section overrides [DatabaseService], if it exists
-            //
-            IConfig groupsConfig = config.Configs[configName];
-            if (groupsConfig != null)
-            {
-                dllName = groupsConfig.GetString("StorageProvider", dllName);
-                connString = groupsConfig.GetString("ConnectionString", connString);
-                realm = groupsConfig.GetString("Realm", realm);
-            }
+                        //
+                        // [Groups] section overrides [DatabaseService], if it exists
+                        //
+                        IConfig groupsConfig = config.Configs[configName];
+                        if (groupsConfig != null)
+                        {
+                                dllName = groupsConfig.GetString("StorageProvider", dllName);
+                                connString = groupsConfig.GetString("ConnectionString", connString);
+                                realm = groupsConfig.GetString("Realm", realm);
+                        }
 
-            //
-            // We tried, but this doesn't exist. We can't proceed.
-            //
-            if (dllName.Equals(String.Empty))
-                throw new Exception("No StorageProvider configured");
+                        //
+                        // We tried, but this doesn't exist. We can't proceed.
+                        //
+                        if (dllName.Equals(String.Empty))
+                                throw new Exception("No StorageProvider configured");
 
-            m_Database = LoadPlugin<IGroupsData>(dllName, new Object[] { connString, realm });
-            if (m_Database == null)
-                throw new Exception("Could not find a storage interface in the given module " + dllName);
-        }
-    }
-}
\ No newline at end of file
+                        m_Database = LoadPlugin<IGroupsData>(dllName, new Object[] { connString, realm });
+                        if (m_Database == null)
+                                throw new Exception("Could not find a storage interface in the given module " + dllName);
+
+                        //
+                        // [GridUserService] section overrides [DatabaseService], if it exists
+                        //
+                        IConfig usersConfig = config.Configs["GridUserService"];
+                        if (usersConfig != null)
+                        {
+                                dllName = usersConfig.GetString("StorageProvider", dllName);
+                                connString = usersConfig.GetString("ConnectionString", connString);
+                usersRealm = usersConfig.GetString("Realm", usersRealm);
+                        }
+
+                        m_GridUserService = LoadPlugin<IGridUserData>(dllName, new Object[] { connString, usersRealm });
+                        if (m_GridUserService == null)
+                                throw new Exception("Could not find a storage inferface for the given users module " + dllName);
+                }
+        }
+}