From c8db23d456a3d3a8c94ed3d387b1a9a5d3c420c8 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Thu, 6 Nov 2008 19:21:50 +0000 Subject: Thank you kindly, Diva for a patch that: Makies OpenSimBase even more friendly to subclassing --- OpenSim/Region/Application/OpenSimBase.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 93cc0a7..f1ff08f 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -178,10 +178,7 @@ namespace OpenSim else { // We are in grid mode - m_commsManager - = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder); - - m_httpServer.AddStreamHandler(new SimStatusHandler()); + InitialiseGridServices(libraryRootFolder); } proxyUrl = ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); @@ -200,7 +197,7 @@ namespace OpenSim /// Initialises the backend services for standalone mode, and registers some http handlers /// /// - protected void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) + protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) { LocalInventoryService inventoryService = new LocalInventoryService(); inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); @@ -239,6 +236,14 @@ namespace OpenSim 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() { // -- cgit v1.1