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

Re-added Grid mode. (which had got removed/disabled in revision 1515)

afrisby
MW 2007-08-06 16:33:54 +00:00
parent e155dcd432
commit 4c9cc74ac2
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Application/Application.cs
View File

@ -53,16 +53,16 @@ namespace OpenSim
Console.WriteLine("Starting...\n"); Console.WriteLine("Starting...\n");
ArgvConfigSource source = new ArgvConfigSource(args); ArgvConfigSource configSource = new ArgvConfigSource(args);
source.AddSwitch("Startup", "inifile"); configSource.AddSwitch("Startup", "inifile");
source.AddSwitch("Startup", "configfile"); configSource.AddSwitch("Startup", "configfile");
source.AddSwitch("Startup", "gridmode"); configSource.AddSwitch("Startup", "gridmode");
source.AddSwitch("Startup", "physics"); configSource.AddSwitch("Startup", "physics");
source.AddSwitch("Startup", "config"); configSource.AddSwitch("Startup", "config");
source.AddSwitch("Startup", "noverbose"); configSource.AddSwitch("Startup", "noverbose");
OpenSimMain sim = new OpenSimMain(source); OpenSimMain sim = new OpenSimMain(configSource);
sim.StartUp(); sim.StartUp();

14
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -77,14 +77,14 @@ namespace OpenSim
string iniFile = startupSource.Configs["Startup"].GetString("inifile", "NA"); string iniFile = startupSource.Configs["Startup"].GetString("inifile", "NA");
if (iniFile != "NA") if (iniFile != "NA")
{ {
//a ini is set to be used for startup settings //a INI file is set to be used for startup settings
string iniFilePath = Path.Combine(Util.configDir(), iniFile); string iniFilePath = Path.Combine(Util.configDir(), iniFile);
if (File.Exists(iniFilePath)) if (File.Exists(iniFilePath))
{ {
startupSource = new IniConfigSource(iniFilePath); startupSource = new IniConfigSource(iniFilePath);
//enable follow line, if we want the original config source(normally commandline args) merged with ini file settings. //enable follow line, if we want the original config source(normally commandline args) merged with ini file settings.
//in this case we have it so if both sources have the same named setting, command line value will overwrite the ini file value. //in this case we have it so that if both sources have the same named setting, the command line value will overwrite the ini file value.
//(as if someone has bothered to enter a command line arg, we should take notice of it) //(as if someone has bothered to enter a command line arg, we should take notice of it)
//startupSource.Merge(configSource); //startupSource.Merge(configSource);
} }
@ -121,6 +121,15 @@ namespace OpenSim
m_httpServer.AddStreamHandler(new SimStatusHandler()); m_httpServer.AddStreamHandler(new SimStatusHandler());
} }
if (m_sandbox)
{
m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
}
else
{
m_commsManager = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache);
}
string regionConfigPath = Path.Combine(Util.configDir(), "Regions"); string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
if (!Directory.Exists(regionConfigPath)) if (!Directory.Exists(regionConfigPath))
@ -227,6 +236,7 @@ namespace OpenSim
} }
#endregion #endregion
/// <summary> /// <summary>
/// Performs any last-minute sanity checking and shuts down the region server /// Performs any last-minute sanity checking and shuts down the region server
/// </summary> /// </summary>

3
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -41,7 +41,6 @@ using libsecondlife;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Caches; using OpenSim.Framework.Communications.Caches;
using OpenSim.Region.Communications.Local;
namespace OpenSim.Region.ClientStack namespace OpenSim.Region.ClientStack
{ {
@ -79,7 +78,7 @@ namespace OpenSim.Region.ClientStack
m_httpServer.Start(); m_httpServer.Start();
m_inventoryCache = new InventoryCache(); m_inventoryCache = new InventoryCache();
m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
} }
protected abstract void Initialize(); protected abstract void Initialize();