1 files changed, 61 insertions, 64 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 6045dc0..3f7c757 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -186,28 +186,25 @@ namespace OpenSim
 
             LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_configSettings.LibrariesXMLFile);
 
-            // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
-            if (m_configSettings.Standalone)
-            {
-                InitialiseStandaloneServices(libraryRootFolder);
-            }
-            else
-            {
-                // We are in grid mode
-                InitialiseGridServices(libraryRootFolder);
-            }
+            //// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
+            //if (m_configSettings.Standalone)
+            //{
+            //    InitialiseStandaloneServices(libraryRootFolder);
+            //}
+            //else
+            //{
+            //    // We are in grid mode
+            //    InitialiseGridServices(libraryRootFolder);
+            //}
 
             // Create a ModuleLoader instance
             m_moduleLoader = new ModuleLoader(m_config.Source);
 
-            LoadPlugins();
-
-            
+            LoadPlugins();  
             foreach (IApplicationPlugin plugin in m_plugins)
             {
                 plugin.PostInitialise();
             }
-            
                                     
             // Only enable logins to the regions once we have completely finished starting up (apart from scripts)
             if ((m_commsManager != null) && (m_commsManager.GridService != null))
@@ -272,56 +269,56 @@ namespace OpenSim
                 m_console.Notice(moduleCommander.Help);
         }
 
-        /// <summary>
-        /// Initialises the backend services for standalone mode, and registers some http handlers
-        /// </summary>
-        /// <param name="libraryRootFolder"></param>
-        protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
-        {
-            LocalInventoryService inventoryService = new LocalInventoryService();
-            inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
-
-            LocalUserServices userService =
-                new LocalUserServices(
-                    m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
-            userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource);
-
-            LocalBackEndServices backendService = new LocalBackEndServices();
-
-            LocalLoginService loginService =
-                new LocalLoginService(
-                    userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_networkServersInfo,
-                    m_configSettings.StandaloneAuthenticate, libraryRootFolder);
-
-            m_commsManager
-                = new CommunicationsLocal(
-                    m_networkServersInfo, m_httpServer, m_assetCache, userService, userService,
-                    inventoryService, backendService, userService,
-                    libraryRootFolder, m_configSettings.DumpAssetsToFile);
-
-            // set up XMLRPC handler for client's initial login request message
-            m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
-
-            // provides the web form login
-            m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
-
-            // Provides the LLSD login
-            m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
-
-            // provide grid info
-            // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini")));
-            m_gridInfoService = new GridInfoService(m_config.Source);
-            m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
-            m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
-        }
-
-        protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
-        {
-            m_commsManager
-                = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder);
-
-            m_httpServer.AddStreamHandler(new SimStatusHandler());
-        }
+        ///// <summary>
+        ///// Initialises the backend services for standalone mode, and registers some http handlers
+        ///// </summary>
+        ///// <param name="libraryRootFolder"></param>
+        //protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
+        //{
+        //    LocalInventoryService inventoryService = new LocalInventoryService();
+        //    inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
+
+        //    LocalUserServices userService =
+        //        new LocalUserServices(
+        //            m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
+        //    userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource);
+
+        //    LocalBackEndServices backendService = new LocalBackEndServices();
+
+        //    LocalLoginService loginService =
+        //        new LocalLoginService(
+        //            userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_networkServersInfo,
+        //            m_configSettings.StandaloneAuthenticate, libraryRootFolder);
+
+        //    m_commsManager
+        //        = new CommunicationsLocal(
+        //            m_networkServersInfo, m_httpServer, m_assetCache, userService, userService,
+        //            inventoryService, backendService, userService,
+        //            libraryRootFolder, m_configSettings.DumpAssetsToFile);
+
+        //    // set up XMLRPC handler for client's initial login request message
+        //    m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
+
+        //    // provides the web form login
+        //    m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
+
+        //    // Provides the LLSD login
+        //    m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
+
+        //    // provide grid info
+        //    // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini")));
+        //    m_gridInfoService = new GridInfoService(m_config.Source);
+        //    m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
+        //    m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
+        //}
+
+        //protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
+        //{
+        //    m_commsManager
+        //        = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder);
+
+        //    m_httpServer.AddStreamHandler(new SimStatusHandler());
+        //}
 
         protected override void Initialize()
         {