aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-09 22:41:39 +0000
committerJustin Clark-Casey (justincc)2011-12-09 22:41:39 +0000
commitcb0da425d5d904920939184e725a60708e6c5842 (patch)
tree3f3576093581f4da89680863aa4cfbe87c062bc4 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
parentMove client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that i... (diff)
downloadopensim-SC_OLD-cb0da425d5d904920939184e725a60708e6c5842.zip
opensim-SC_OLD-cb0da425d5d904920939184e725a60708e6c5842.tar.gz
opensim-SC_OLD-cb0da425d5d904920939184e725a60708e6c5842.tar.bz2
opensim-SC_OLD-cb0da425d5d904920939184e725a60708e6c5842.tar.xz
Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 3f9834c..9b468dd 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 {