diff options
| author | Diva Canto | 2015-10-18 16:59:47 -0700 |
|---|---|---|
| committer | Diva Canto | 2015-10-18 21:50:11 -0700 |
| commit | 839e239c991d82677e6bee61d2704151e652345f (patch) | |
| tree | 90a70a2a666e273bafb0bf68b9d507e2593d042a | |
| parent | Fixed merge conflicts (diff) | |
| download | opensim-SC_OLD-839e239c991d82677e6bee61d2704151e652345f.zip opensim-SC_OLD-839e239c991d82677e6bee61d2704151e652345f.tar.gz opensim-SC_OLD-839e239c991d82677e6bee61d2704151e652345f.tar.bz2 opensim-SC_OLD-839e239c991d82677e6bee61d2704151e652345f.tar.xz | |
Added warning in RegionCombinerModule about it being considered obsolete and encouraging people to switch to varregions.
| -rw-r--r-- | OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerModule.cs index 98b0ae1..32eead0 100644 --- a/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerModule.cs | |||
| @@ -79,6 +79,8 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 79 | { | 79 | { |
| 80 | IConfig myConfig = source.Configs["Startup"]; | 80 | IConfig myConfig = source.Configs["Startup"]; |
| 81 | m_combineContiguousRegions = myConfig.GetBoolean("CombineContiguousRegions", false); | 81 | m_combineContiguousRegions = myConfig.GetBoolean("CombineContiguousRegions", false); |
| 82 | if (m_combineContiguousRegions) | ||
| 83 | m_log.ErrorFormat("[REGION COMBINER MODULE]: THIS MODULE IS BEING MARKED OBSOLETE AND MAY SOON BE REMOVED. PLEASE USE VARREGIONS INSTEAD."); | ||
| 82 | 84 | ||
| 83 | MainConsole.Instance.Commands.AddCommand( | 85 | MainConsole.Instance.Commands.AddCommand( |
| 84 | "RegionCombinerModule", false, "fix-phantoms", "fix-phantoms", | 86 | "RegionCombinerModule", false, "fix-phantoms", "fix-phantoms", |