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
							parent
							
								
									e2d30a0244
								
							
						
					
					
						commit
						4f072a0876
					
				| 
						 | 
				
			
			@ -64,6 +64,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 | 
			
		|||
        protected OpenSimBase m_openSim;
 | 
			
		||||
 | 
			
		||||
        protected BaseHttpServer m_httpServer;
 | 
			
		||||
 | 
			
		||||
        protected CommunicationsManager m_commsManager;
 | 
			
		||||
        protected GridInfoService m_gridInfoService;
 | 
			
		||||
        protected IHyperlink HGServices = null;
 | 
			
		||||
| 
						 | 
				
			
			@ -114,20 +115,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 | 
			
		|||
        {
 | 
			
		||||
            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)
 | 
			
		||||
            if (openSim is HGOpenSimNode)
 | 
			
		||||
            {
 | 
			
		||||
                HGOpenSimNode hgNode = (HGOpenSimNode)openSim;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -143,6 +131,19 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 | 
			
		|||
                }
 | 
			
		||||
                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;
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue