aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorUbitUmarov2016-07-27 23:13:24 +0100
committerUbitUmarov2016-07-27 23:13:24 +0100
commit01289b9c2d29dc9db5aec62fff7f38b87f34ee38 (patch)
tree67aa928e3fd61fba670e4bb78969cb2354606419 /OpenSim/Region/Application
parent but buoyancy was missing (diff)
downloadopensim-SC_OLD-01289b9c2d29dc9db5aec62fff7f38b87f34ee38.zip
opensim-SC_OLD-01289b9c2d29dc9db5aec62fff7f38b87f34ee38.tar.gz
opensim-SC_OLD-01289b9c2d29dc9db5aec62fff7f38b87f34ee38.tar.bz2
opensim-SC_OLD-01289b9c2d29dc9db5aec62fff7f38b87f34ee38.tar.xz
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
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);