OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed CreateCommsManagerPlugin so it handles external subclasses of OpenSimBase. This process of checking if it should be creating HG or normal CommunicationsManager needs to change. 

So look out for a revert of this whole plugin soon.
GenericGridServerConcept
MW 2009-02-26 22:03:53 +00:00
parent e2d30a0244
commit 4f072a0876
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
View File

@ -64,6 +64,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
protected OpenSimBase m_openSim; protected OpenSimBase m_openSim;
protected BaseHttpServer m_httpServer; protected BaseHttpServer m_httpServer;
protected CommunicationsManager m_commsManager; protected CommunicationsManager m_commsManager;
protected GridInfoService m_gridInfoService; protected GridInfoService m_gridInfoService;
protected IHyperlink HGServices = null; protected IHyperlink HGServices = null;
@ -114,20 +115,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
{ {
LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile); LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile);
if ((openSim is OpenSim) || (openSim is OpenSimBackground)) if (openSim is HGOpenSimNode)
{
// 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; HGOpenSimNode hgNode = (HGOpenSimNode)openSim;
@ -143,6 +131,19 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
} }
hgNode.HGServices = HGServices; hgNode.HGServices = HGServices;
} }
else
{
// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
if (m_openSim.ConfigurationSettings.Standalone)
{
InitialiseStandaloneServices(libraryRootFolder);
}
else
{
// We are in grid mode
InitialiseGridServices(libraryRootFolder);
}
}
openSim.CommunicationsManager = m_commsManager; openSim.CommunicationsManager = m_commsManager;
} }