dust
parent
751e70af78
commit
7e6980b20d
|
@ -104,34 +104,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
|
||||||
{
|
{
|
||||||
LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile);
|
LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile);
|
||||||
|
|
||||||
bool hgrid = m_openSim.ConfigSource.Source.Configs["Startup"].GetBoolean("hypergrid", false);
|
|
||||||
|
|
||||||
if (hgrid)
|
|
||||||
{
|
|
||||||
InitialiseHGServices(openSim, libraryRootFolder);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
InitialiseStandardServices(libraryRootFolder);
|
InitialiseStandardServices(libraryRootFolder);
|
||||||
}
|
|
||||||
|
|
||||||
openSim.CommunicationsManager = m_commsManager;
|
openSim.CommunicationsManager = m_commsManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void InitialiseHGServices(OpenSimBase openSim, LibraryRootFolder libraryRootFolder)
|
|
||||||
{
|
|
||||||
// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
|
|
||||||
if (m_openSim.ConfigurationSettings.Standalone)
|
|
||||||
{
|
|
||||||
InitialiseHGStandaloneServices(libraryRootFolder);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// We are in grid mode
|
|
||||||
InitialiseHGGridServices(libraryRootFolder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder)
|
protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder)
|
||||||
{
|
{
|
||||||
// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
|
// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
|
||||||
|
@ -165,21 +142,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
|
||||||
m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
|
m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
|
|
||||||
{
|
|
||||||
|
|
||||||
CreateGridInfoService();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder)
|
|
||||||
{
|
|
||||||
|
|
||||||
m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
|
|
||||||
m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
|
|
||||||
if (m_openSim.userStatsURI != String.Empty)
|
|
||||||
m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CreateGridInfoService()
|
private void CreateGridInfoService()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue