From a87a247f0548d39a8c39b1d28123d7da8db44598 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Jan 2010 07:20:13 +0000
Subject: Revert "Updates all IRegionModules to the new style region modules."

This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
---
 .../Hypergrid/HGStandaloneLoginModule.cs           | 83 ++++++++--------------
 1 file changed, 31 insertions(+), 52 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs')

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
index f9c594b..0b54746 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -32,7 +32,6 @@ using System.Net;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using Nwc.XmlRpc;
@@ -47,8 +46,7 @@ using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Hypergrid
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class HGStandaloneLoginModule : ISharedRegionModule, ILoginServiceToRegionsConnector
+    public class HGStandaloneLoginModule : IRegionModule, ILoginServiceToRegionsConnector
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -58,58 +56,47 @@ namespace OpenSim.Region.CoreModules.Hypergrid
         protected bool m_enabled = false; // Module is only enabled if running in standalone mode
 
         protected HGLoginAuthService m_loginService;
-        private bool authenticate = true;
-        private string welcomeMessage = "Welcome to OpenSim";
-        private IConfig startupConfig;
-        private IConfig standaloneConfig;
-                    
-        #region ISharedRegionModule Members
-
-        public void Initialise(IConfigSource source)
-        {
-            startupConfig = source.Configs["Startup"];
-            standaloneConfig = source.Configs["StandAlone"];
-            if (standaloneConfig != null)
-            {
-                authenticate = standaloneConfig.GetBoolean("accounts_authenticate", true);
-                welcomeMessage = standaloneConfig.GetString("welcome_message");
-            }
-            m_enabled = !startupConfig.GetBoolean("gridmode", false);
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
 
-        public void AddRegion(Scene scene)
-        {
-        }
+        #region IRegionModule Members
 
-        public void RegionLoaded(Scene scene)
+        public void Initialise(Scene scene, IConfigSource source)
         {
             if (m_firstScene == null)
             {
                 m_firstScene = scene;
 
+                IConfig startupConfig = source.Configs["Startup"];
+                if (startupConfig != null)
+                {
+                    m_enabled = !startupConfig.GetBoolean("gridmode", false);
+                }
+
                 if (m_enabled)
                 {
                     m_log.Debug("[HGLogin]: HGlogin module enabled");
+                    bool authenticate = true;
+                    string welcomeMessage = "Welcome to OpenSim";
+                    IConfig standaloneConfig = source.Configs["StandAlone"];
+                    if (standaloneConfig != null)
+                    {
+                        authenticate = standaloneConfig.GetBoolean("accounts_authenticate", true);
+                        welcomeMessage = standaloneConfig.GetString("welcome_message");
+                    }
 
                     //TODO: fix casting.
                     LibraryRootFolder rootFolder = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder;
-
+                   
                     IHttpServer httpServer = MainServer.Instance;
 
                     //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
-                    m_loginService
+                    m_loginService 
                         = new HGLoginAuthService(
-                            (UserManagerBase)m_firstScene.CommsManager.UserAdminService,
-                            welcomeMessage,
-                            m_firstScene.CommsManager.InterServiceInventoryService,
-                            m_firstScene.CommsManager.NetworkServersInfo,
-                            authenticate,
-                            rootFolder,
+                            (UserManagerBase)m_firstScene.CommsManager.UserAdminService, 
+                            welcomeMessage, 
+                            m_firstScene.CommsManager.InterServiceInventoryService, 
+                            m_firstScene.CommsManager.NetworkServersInfo, 
+                            authenticate, 
+                            rootFolder, 
                             this);
 
                     httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod);
@@ -126,19 +113,6 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             }
         }
 
-        public void RemoveRegion(Scene scene)
-        {
-            if (scene == m_firstScene)
-            {
-                IHttpServer httpServer = MainServer.Instance;
-                httpServer.RemoveXmlRPCHandler("hg_login");
-                httpServer.RemoveXmlRPCHandler("check_auth_session");
-                httpServer.RemoveXmlRPCHandler("get_avatar_appearance");
-                httpServer.RemoveXmlRPCHandler("update_avatar_appearance");
-            }
-            m_scenes.Remove(scene);
-        }
-
         public void PostInitialise()
         {
 
@@ -154,6 +128,11 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             get { return "HGStandaloneLoginModule"; }
         }
 
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+
         #endregion
 
         protected void AddScene(Scene scene)
-- 
cgit v1.1