diff options
| author | Melanie | 2011-12-09 22:55:08 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-09 22:55:08 +0000 |
| commit | 5f6a4c4111b996cc8cea20b5d39d902db4aa4dba (patch) | |
| tree | a91059a30d7997c78ac267aeb33816bfd747c6c0 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |
| parent | Restore the Avination way of position and angle calculation so resizers (diff) | |
| parent | remove some unused fields in ScenePresence (diff) | |
| download | opensim-SC-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.zip opensim-SC-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.tar.gz opensim-SC-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.tar.bz2 opensim-SC-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index e4a3ba0..cf2f46a 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
| @@ -67,11 +67,12 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 67 | { | 67 | { |
| 68 | IConfig myConfig = source.Configs["Startup"]; | 68 | IConfig myConfig = source.Configs["Startup"]; |
| 69 | enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false); | 69 | enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false); |
| 70 | //enabledYN = true; | 70 | |
| 71 | if (enabledYN) | 71 | if (enabledYN) |
| 72 | MainConsole.Instance.Commands.AddCommand("RegionCombinerModule", false, "fix-phantoms", | 72 | MainConsole.Instance.Commands.AddCommand( |
| 73 | "Fix phantom objects", "Fixes phantom objects after an import to megaregions", FixPhantoms); | 73 | "RegionCombinerModule", false, "fix-phantoms", "fix-phantoms", |
| 74 | } | 74 | "Fixes phantom objects after an import to megaregions", FixPhantoms); |
| 75 | } | ||
| 75 | 76 | ||
| 76 | public void Close() | 77 | public void Close() |
| 77 | { | 78 | { |