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

first step removing MegaRegions: refuse to run. Thanks to all that made MegaRegions possible, they where a important OpenSim feature, but can no longer be mantained

LSLKeyTest
UbitUmarov 2016-07-27 23:13:24 +01:00
parent 9aacdca653
commit 01289b9c2d
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -157,7 +157,16 @@ namespace OpenSim.Framework.Servers
"[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n", "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32"); Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
StartupSpecific(); try
{
StartupSpecific();
}
catch(Exception e)
{
m_log.FatalFormat("Fatal error: {0}",
(e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message );
Environment.Exit(1);
}
TimeSpan timeTaken = DateTime.Now - m_startuptime; TimeSpan timeTaken = DateTime.Now - m_startuptime;

7
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -218,6 +218,13 @@ namespace OpenSim
IConfig startupConfig = Config.Configs["Startup"]; IConfig startupConfig = Config.Configs["Startup"];
if (startupConfig != null) if (startupConfig != null)
{ {
// refuse to run MegaRegions
if(startupConfig.GetBoolean("CombineContiguousRegions", false))
{
m_log.Fatal("CombineContiguousRegions (MegaRegions) option is no longer suported. Use a older version to save region contents as OAR, then import into a fresh install of this new version");
throw new Exception("CombineContiguousRegions not suported");
}
string pidFile = startupConfig.GetString("PIDFile", String.Empty); string pidFile = startupConfig.GetString("PIDFile", String.Empty);
if (pidFile != String.Empty) if (pidFile != String.Empty)
CreatePIDFile(pidFile); CreatePIDFile(pidFile);