1 files changed, 56 insertions, 37 deletions

diff --git a/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
index 10d6f80..6d975af 100644
--- a/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -26,75 +26,94 @@
  */
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Reflection;
+using System.Collections.Generic;
 using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
+using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Grid.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Server.Base;
+using OpenSim.Server.Handlers.Base;
+using OpenSim.Server.Handlers.Grid;
+using OpenSim.Services.Interfaces;
 
-namespace OpenSim.Grid.UserServer.Modules
+namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
 {
-    public class UserDataBaseService : UserManagerBase
+    public class GridInfoServiceInConnectorModule : ISharedRegionModule
     {
-        protected IGridServiceCore m_core;
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static bool m_Enabled = false;
+        
+        private IConfigSource m_Config;
+        bool m_Registered = false;
 
-        public UserDataBaseService(CommunicationsManager commsManager)
-            : base(commsManager)
-        {
-        }
+        #region IRegionModule interface
 
-        public void Initialise(IGridServiceCore core)
+        public void Initialise(IConfigSource config)
         {
-            m_core = core;
-
-            UserConfig cfg;
-            if (m_core.TryGet<UserConfig>(out cfg))
+            m_Config = config;
+            IConfig moduleConfig = config.Configs["Modules"];
+            if (moduleConfig != null)
             {
-                AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect);
+                m_Enabled = moduleConfig.GetBoolean("GridInfoServiceInConnector", false);
+                if (m_Enabled)
+                {
+                    m_log.Info("[GRIDINFO IN CONNECTOR]: GridInfo Service In Connector enabled");
+                }
+
             }
 
-            m_core.RegisterInterface<UserDataBaseService>(this);
         }
 
         public void PostInitialise()
         {
         }
 
-        public void RegisterHandlers(BaseHttpServer httpServer)
+        public void Close()
         {
         }
 
-        public UserAgentData GetUserAgentData(UUID AgentID)
+        public Type ReplaceableInterface 
         {
-            UserProfileData userProfile = GetUserProfile(AgentID);
-
-            if (userProfile != null)
-            {
-                return userProfile.CurrentAgent;
-            }
+            get { return null; }
+        }
 
-            return null;
+        public string Name
+        {
+            get { return "GridInfoService"; }
         }
 
-        public override UserProfileData SetupMasterUser(string firstName, string lastName)
+        public void AddRegion(Scene scene)
         {
-            throw new Exception("The method or operation is not implemented.");
+            if (!m_Enabled)
+                return;
         }
 
-        public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
+        public void RemoveRegion(Scene scene)
         {
-            throw new Exception("The method or operation is not implemented.");
+            if (!m_Enabled)
+                return;
         }
 
-        public override UserProfileData SetupMasterUser(UUID uuid)
+        public void RegionLoaded(Scene scene)
         {
-            throw new Exception("The method or operation is not implemented.");
+            if (!m_Enabled)
+                return;
+
+            if (!m_Registered)
+            {
+                m_Registered = true;
+
+                m_log.Info("[GridInfo]: Starting...");
+
+                new GridInfoServerInConnector(m_Config, MainServer.Instance, "GridInfoService");
+            }
+
         }
+
+        #endregion
+
     }
 }