diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs new file mode 100644 index 0000000000..a5a447081b --- /dev/null +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs @@ -0,0 +1,253 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.Collections.Generic; +using System.Reflection; +using System.Threading; +using log4net; +using OpenSim.Framework; +using OpenSim.Framework.RegionLoader.Filesystem; +using OpenSim.Framework.RegionLoader.Web; +using OpenSim.Region.CoreModules.Agent.AssetTransaction; +using OpenSim.Region.CoreModules.Avatar.InstantMessage; +using OpenSim.Region.CoreModules.Scripting.DynamicTexture; +using OpenSim.Region.CoreModules.Scripting.LoadImageURL; +using OpenSim.Region.CoreModules.Scripting.XMLRPC; +using OpenSim.Framework.Communications; +using OpenSim.Framework.Communications.Cache; +using OpenSim.Region.Communications.Hypergrid; +using OpenSim.Region.Communications.Local; +using OpenSim.Region.Communications.OGS1; +using OpenSim.Framework.Servers; +using OpenSim.ApplicationPlugins.LoadRegions; + +namespace OpenSim.ApplicationPlugins.CreateCommsManager +{ + public class CreateCommsManagerPlugin : IApplicationPlugin + { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + + #region IApplicationPlugin Members + + // TODO: required by IPlugin, but likely not at all right + string m_name = "CreateCommsManagerPlugin"; + string m_version = "0.0"; + + public string Version { get { return m_version; } } + public string Name { get { return m_name; } } + + protected OpenSimBase m_openSim; + + protected BaseHttpServer m_httpServer; + protected CommunicationsManager m_commsManager; + protected GridInfoService m_gridInfoService; + protected IHyperlink HGServices = null; + + protected LoadRegionsPlugin m_loadRegionsPlugin; + + public void Initialise() + { + m_log.Info("[LOADREGIONS]: " + Name + " cannot be default-initialized!"); + throw new PluginNotInitialisedException(Name); + } + + public void Initialise(OpenSimBase openSim) + { + m_openSim = openSim; + m_httpServer = openSim.HttpServer; + + InitialiseCommsManager(openSim); + if (m_commsManager != null) + { + m_openSim.ApplicationRegistry.RegisterInterface(m_commsManager.UserService); + } + } + + public void PostInitialise() + { + if (m_openSim.ApplicationRegistry.TryGet(out m_loadRegionsPlugin)) + { + m_loadRegionsPlugin.OnNewRegionCreated += RegionCreated; + } + } + + public void Dispose() + { + } + + #endregion + + private void RegionCreated(IScene scene) + { + if (m_commsManager != null) + { + scene.RegisterModuleInterface(m_commsManager.UserService); + } + } + + private void InitialiseCommsManager(OpenSimBase openSim) + { + LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile); + + if ((openSim is OpenSim) || (openSim is OpenSimBackground)) + { + // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) + if (m_openSim.ConfigurationSettings.Standalone) + { + InitialiseStandaloneServices(libraryRootFolder); + } + else + { + // We are in grid mode + InitialiseGridServices(libraryRootFolder); + } + } + else if (openSim is HGOpenSimNode) + { + HGOpenSimNode hgNode = (HGOpenSimNode)openSim; + + // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) + if (m_openSim.ConfigurationSettings.Standalone) + { + InitialiseHGStandaloneServices(libraryRootFolder); + } + else + { + // We are in grid mode + InitialiseHGGridServices(libraryRootFolder); + } + hgNode.HGServices = HGServices; + } + + openSim.CommunicationsManager = m_commsManager; + } + + /// + /// Initialises the backend services for standalone mode, and registers some http handlers + /// + /// + protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) + { + LocalInventoryService inventoryService = new LocalInventoryService(); + inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, m_openSim.ConfigurationSettings.StandaloneInventorySource); + + LocalUserServices userService = + new LocalUserServices( + m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); + userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource); + + LocalBackEndServices backendService = new LocalBackEndServices(); + + LocalLoginService loginService = + new LocalLoginService( + userService, m_openSim.ConfigurationSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_openSim.NetServersInfo, + m_openSim.ConfigurationSettings.StandaloneAuthenticate, libraryRootFolder); + + m_commsManager + = new CommunicationsLocal( + m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, userService, userService, + inventoryService, backendService, userService, + libraryRootFolder, m_openSim.ConfigurationSettings.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_openSim.ConfigSource.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_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, libraryRootFolder); + + m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); + } + + protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) + { + // Standalone mode + + HGInventoryService inventoryService = new HGInventoryService(m_openSim.NetServersInfo.InventoryURL, null, false); + inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, m_openSim.ConfigurationSettings.StandaloneInventorySource); + + LocalUserServices userService = + new LocalUserServices( + m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); + userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource); + + //LocalBackEndServices backendService = new LocalBackEndServices(); + HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); + + LocalLoginService loginService = + new LocalLoginService( + userService, m_openSim.ConfigurationSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_openSim.NetServersInfo, + m_openSim.ConfigurationSettings.StandaloneAuthenticate, libraryRootFolder); + + + m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, + userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); + + inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService; + HGServices = gridService; + + // 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_openSim.ConfigSource.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 InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) + { + m_commsManager = new HGCommunicationsGridMode(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder); + + HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices; + + m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); + } + } +} diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/Resources/CreateCommsManagerPlugin.addin.xml b/OpenSim/ApplicationPlugins/CreateCommsManager/Resources/CreateCommsManagerPlugin.addin.xml new file mode 100644 index 0000000000..2a488efa34 --- /dev/null +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/Resources/CreateCommsManagerPlugin.addin.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index c400309b7f..572d045e2c 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs @@ -89,6 +89,9 @@ namespace OpenSim.Framework T RequestModuleInterface(); T[] RequestModuleInterfaces(); + void RegisterModuleInterface(M mod); + void StackModuleInterface(M mod); + void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback); } } diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index 1130c70863..b0be40db2d 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs @@ -73,57 +73,57 @@ namespace OpenSim } - protected override void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) - { - // Standalone mode + //protected override void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) + //{ + // // Standalone mode - HGInventoryService inventoryService = new HGInventoryService(m_networkServersInfo.InventoryURL, null, false); - inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); + // HGInventoryService inventoryService = new HGInventoryService(m_networkServersInfo.InventoryURL, null, false); + // 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); + // LocalUserServices userService = + // new LocalUserServices( + // m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); + // userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); - //LocalBackEndServices backendService = new LocalBackEndServices(); - HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager); + // //LocalBackEndServices backendService = new LocalBackEndServices(); + // HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager); - LocalLoginService loginService = - new LocalLoginService( - userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_networkServersInfo, - m_configSettings.StandaloneAuthenticate, libraryRootFolder); + // LocalLoginService loginService = + // new LocalLoginService( + // userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_networkServersInfo, + // m_configSettings.StandaloneAuthenticate, libraryRootFolder); - m_commsManager = new HGCommunicationsStandalone(m_networkServersInfo, m_httpServer, m_assetCache, - userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_configSettings.DumpAssetsToFile); + // m_commsManager = new HGCommunicationsStandalone(m_networkServersInfo, m_httpServer, m_assetCache, + // userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_configSettings.DumpAssetsToFile); - inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService; - HGServices = gridService; + // inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService; + // HGServices = gridService; - // set up XMLRPC handler for client's initial login request message - m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); + // // 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 web form login + // m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin); - // Provides the LLSD login - m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod); + // // 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)); - } + // // 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 override void InitialiseGridServices(LibraryRootFolder libraryRootFolder) - { - m_commsManager = new HGCommunicationsGridMode(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager, libraryRootFolder); + //protected override void InitialiseGridServices(LibraryRootFolder libraryRootFolder) + //{ + // m_commsManager = new HGCommunicationsGridMode(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager, libraryRootFolder); - HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices; + // HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices; - m_httpServer.AddStreamHandler(new SimStatusHandler()); - } + // m_httpServer.AddStreamHandler(new SimStatusHandler()); + //} protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, AgentCircuitManager circuitManager) diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 6045dc05f5..3f7c757a9d 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); } - /// - /// Initialises the backend services for standalone mode, and registers some http handlers - /// - /// - protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) - { - LocalInventoryService inventoryService = new LocalInventoryService(); - inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); + ///// + ///// Initialises the backend services for standalone mode, and registers some http handlers + ///// + ///// + //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); + // LocalUserServices userService = + // new LocalUserServices( + // m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); + // userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); - LocalBackEndServices backendService = new LocalBackEndServices(); + // LocalBackEndServices backendService = new LocalBackEndServices(); - LocalLoginService loginService = - new LocalLoginService( - userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_networkServersInfo, - m_configSettings.StandaloneAuthenticate, libraryRootFolder); + // 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); + // 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); + // // 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 web form login + // m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin); - // Provides the LLSD login - m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod); + // // 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)); - } + // // 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); + //protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) + //{ + // m_commsManager + // = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder); - m_httpServer.AddStreamHandler(new SimStatusHandler()); - } + // m_httpServer.AddStreamHandler(new SimStatusHandler()); + //} protected override void Initialize() { diff --git a/prebuild.xml b/prebuild.xml index 8b388e4516..2531e0b7b8 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -1429,6 +1429,48 @@ + + + + ../../../bin/ + + + + + ../../../bin/ + + + + ../../../bin/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +