OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added "[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]" to 

SymmetricSync modules that implement INonSharedRegionModule. They now start running as a region is loaded.
dsg
Huaiyu (Kitty) Liu 2010-12-21 13:23:52 -08:00
parent e96625c8ca
commit cb49cfe6c5
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
View File

@ -75,7 +75,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
} }
// If syncConfig does not indicate "server", do not start up server mode // 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") if(mode != "server")
{ {
scene.RegionSyncEnabled = false; scene.RegionSyncEnabled = false;

13
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
View File

@ -17,18 +17,21 @@ using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading; using System.Threading;
using Mono.Addins;
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
//KittyL: created 12/17/2010, to start DSG Symmetric Synch implementation //KittyL: created 12/17/2010, to start DSG Symmetric Synch implementation
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{ {
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]
//The connector that connects the local Scene (cache) and remote authoratative Scene
public class RegionSyncModule : INonSharedRegionModule, IRegionSyncModule, ICommandableModule public class RegionSyncModule : INonSharedRegionModule, IRegionSyncModule, ICommandableModule
//public class RegionSyncModule : IRegionModule, IRegionSyncModule, ICommandableModule
{ {
#region INonSharedRegionModule #region INonSharedRegionModule
public void Initialise(IConfigSource config) public void Initialise(IConfigSource config)
//public void Initialise(Scene scene, IConfigSource config)
{ {
m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 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 = new RegionSyncListener(m_syncListenerAddr, m_syncListenerPort, this);
m_regionSyncListener.Start(); 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) private void SyncStart(Object[] args)

3
bin/config-include/SimianGrid.ini
View File

@ -64,7 +64,8 @@
AssetLoaderArgs = "assets/AssetSets.xml" AssetLoaderArgs = "assets/AssetSets.xml"
[Groups] [Groups]
Enabled = true ;Enabled = true
Enabled = false
Module = GroupsModule Module = GroupsModule
DebugEnabled = false DebugEnabled = false
NoticesEnabled = true NoticesEnabled = true