diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs index 90b768c14b..318da00581 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs @@ -75,7 +75,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule } // If syncConfig does not indicate "server", do not start up server mode - string mode = syncConfig.GetString("Mode", "server").ToLower(); + //string mode = syncConfig.GetString("Mode", "server").ToLower(); + string mode = syncConfig.GetString("Mode", "").ToLower(); if(mode != "server") { scene.RegionSyncEnabled = false; diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs index 6ba7923c8c..e54c8e742d 100755 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs @@ -17,18 +17,21 @@ using System.Net; using System.Net.Sockets; using System.Threading; +using Mono.Addins; + ///////////////////////////////////////////////////////////////////////////////////////////// //KittyL: created 12/17/2010, to start DSG Symmetric Synch implementation ///////////////////////////////////////////////////////////////////////////////////////////// namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule { - - //The connector that connects the local Scene (cache) and remote authoratative Scene + [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")] public class RegionSyncModule : INonSharedRegionModule, IRegionSyncModule, ICommandableModule + //public class RegionSyncModule : IRegionModule, IRegionSyncModule, ICommandableModule { #region INonSharedRegionModule public void Initialise(IConfigSource config) + //public void Initialise(Scene scene, IConfigSource config) { m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -256,8 +259,10 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule { m_regionSyncListener = new RegionSyncListener(m_syncListenerAddr, m_syncListenerPort, this); m_regionSyncListener.Start(); - m_statsTimer.Elapsed += new System.Timers.ElapsedEventHandler(StatsTimerElapsed); - m_statsTimer.Start(); + + //STATS TIMER: TO BE IMPLEMENTED + //m_statsTimer.Elapsed += new System.Timers.ElapsedEventHandler(StatsTimerElapsed); + //m_statsTimer.Start(); } private void SyncStart(Object[] args) diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini index bbc0c0813e..65ca1f1787 100644 --- a/bin/config-include/SimianGrid.ini +++ b/bin/config-include/SimianGrid.ini @@ -64,7 +64,8 @@ AssetLoaderArgs = "assets/AssetSets.xml" [Groups] - Enabled = true + ;Enabled = true + Enabled = false Module = GroupsModule DebugEnabled = false NoticesEnabled = true