Thank you kindly, Diva for a patch that:
Makies OpenSimBase even more friendly to subclassing0.6.0-stable
parent
9efc4e303b
commit
c8db23d456
|
@ -178,10 +178,7 @@ namespace OpenSim
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We are in grid mode
|
// We are in grid mode
|
||||||
m_commsManager
|
InitialiseGridServices(libraryRootFolder);
|
||||||
= new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder);
|
|
||||||
|
|
||||||
m_httpServer.AddStreamHandler(new SimStatusHandler());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
proxyUrl = ConfigSource.Source.Configs["Network"].GetString("proxy_url", "");
|
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
|
/// Initialises the backend services for standalone mode, and registers some http handlers
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="libraryRootFolder"></param>
|
/// <param name="libraryRootFolder"></param>
|
||||||
protected void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
|
protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
|
||||||
{
|
{
|
||||||
LocalInventoryService inventoryService = new LocalInventoryService();
|
LocalInventoryService inventoryService = new LocalInventoryService();
|
||||||
inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
|
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));
|
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()
|
protected override void Initialize()
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in New Issue