aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 41966ff..52ded3d 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -218,6 +218,13 @@ namespace OpenSim
218 IConfig startupConfig = Config.Configs["Startup"]; 218 IConfig startupConfig = Config.Configs["Startup"];
219 if (startupConfig != null) 219 if (startupConfig != null)
220 { 220 {
221 // refuse to run MegaRegions
222 if(startupConfig.GetBoolean("CombineContiguousRegions", false))
223 {
224 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");
225 throw new Exception("CombineContiguousRegions not suported");
226 }
227
221 string pidFile = startupConfig.GetString("PIDFile", String.Empty); 228 string pidFile = startupConfig.GetString("PIDFile", String.Empty);
222 if (pidFile != String.Empty) 229 if (pidFile != String.Empty)
223 CreatePIDFile(pidFile); 230 CreatePIDFile(pidFile);