Getting rid of -hypergrid=true on the command line. This config now goes inside OpenSim.ini in the Startup section. This makes the HG compatible with -background, and prepares the way for further work on HG-related config vars. Might help with mantis #3527.

This commit is contained in:
diva
2009-04-27 00:16:59 +00:00
parent 1ce362323e
commit d8313e314f
6 changed files with 53 additions and 81 deletions

View File

@@ -130,20 +130,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
protected void InitialiseHGServices(OpenSimBase openSim, LibraryRootFolder libraryRootFolder)
{
HGOpenSimNode hgNode = null;
try
{
hgNode = (HGOpenSimNode) openSim;
}
catch (Exception e)
{
m_log.Error("[CreateComms] " + e.Message);
m_log.Error("[CreateComms] The OpenSim application class was : " + openSim.ToString());
m_log.Error("[CreateComms] To use hypergrid mode, please make sure you are starting opensim with the command line: opensim.exe -hypergrid=true");
m_log.Error("[CreateComms] Also hypergrid mode can not be ran while using the -background=true command line argument.");
Environment.Exit(1);
}
// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
if (m_openSim.ConfigurationSettings.Standalone)
{
@@ -154,7 +140,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
// We are in grid mode
InitialiseHGGridServices(libraryRootFolder);
}
hgNode.HGServices = HGServices;
HGCommands.HGServices = HGServices;
}
protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder)