* Rename the RegionCombiner Module from PhysicsCombiner

2 files changed, 6 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index e38c755..8831791 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -10,7 +10,7 @@
     <Extension path = "/OpenSim/RegionModules">
         <RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capabilities.CapabilitiesModule" />
         <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" />
-        <RegionModule id="PhysicsCombiner" type="OpenSim.Region.CoreModules.World.Land.PhysicsCombiner" />
+        <RegionModule id="RegionCombinerModule" type="OpenSim.Region.CoreModules.World.Land.RegionCombinerModule" />
         <RegionModule id="WorldMapModule" type="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" />
         <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" />
         <RegionModule id="UrlModule" type="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" />
diff --git a/OpenSim/Region/CoreModules/World/Land/PhysicsCombiner.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
index 8921085..5ba6f39 100644
--- a/OpenSim/Region/CoreModules/World/Land/PhysicsCombiner.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
@@ -10,11 +10,11 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.World.Land
 {
-    public class PhysicsCombiner : ISharedRegionModule
+    public class RegionCombinerModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public string Name { get { return "PhysicsCombiner";}  }
+        public string Name { get { return "RegionCombinerModule"; } }
         public Type ReplaceableInterface
         {
             get { return null; }
@@ -23,10 +23,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         public Type ReplacableInterface { get { return null; } }
 
         private Dictionary<UUID, RegionConnections> m_regions = new Dictionary<UUID, RegionConnections>();
-        private bool enabledYN = true;
+        private bool enabledYN = false;
         public void Initialise(IConfigSource source)
         {
-            
+            IConfig myConfig = source.Configs["Startup"];
+            enabledYN = myConfig.GetBoolean("CombineContiguiousRegions", false);
         }
 
         public void Close()