ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
MW
2007-08-06 16:33:54 +00:00
parent e155dcd432
commit 4c9cc74ac2
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,14 +77,14 @@ namespace OpenSim
string iniFile = startupSource.Configs["Startup"].GetString("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);
if (File.Exists(iniFilePath))
{
startupSource = new IniConfigSource(iniFilePath);
//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)
//startupSource.Merge(configSource);
}
@@ -121,6 +121,15 @@ namespace OpenSim
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");
if (!Directory.Exists(regionConfigPath))
@@ -227,6 +236,7 @@ namespace OpenSim
}
#endregion
/// <summary>
/// Performs any last-minute sanity checking and shuts down the region server
/// </summary>