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

Move actor registration to actor modules. Add physics registation

dsg
Robert Adams 2011-02-14 09:37:36 -08:00
parent 9970677ed8
commit 4d343d0fea
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/PhysicsEngineSyncModule.cs
View File

@ -77,6 +77,13 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//register the module with SceneGraph. If needed, SceneGraph checks the module's ActorType to know what type of module it is. //register the module with SceneGraph. If needed, SceneGraph checks the module's ActorType to know what type of module it is.
m_scene.RegisterModuleInterface<IDSGActorSyncModule>(this); m_scene.RegisterModuleInterface<IDSGActorSyncModule>(this);
// register actor
if (!scene.GridService.RegisterActor(scene.RegionInfo.RegionID.ToString(),
"physics_engine", scene.RegionInfo.RegionID.ToString()))
{
m_log.ErrorFormat("{0}: Failure registering actor", LogHeader);
}
// Setup the command line interface // Setup the command line interface
//m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; //m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
//InstallInterfaces(); //InstallInterfaces();

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

@ -777,11 +777,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{ {
m_log.ErrorFormat("{0}: Failure registering endpoint", LogHeader); m_log.ErrorFormat("{0}: Failure registering endpoint", LogHeader);
} }
if (!m_scene.GridService.RegisterActor(m_scene.RegionInfo.RegionID.ToString(),
"scene_persistence", m_scene.RegionInfo.RegionID.ToString()))
{
m_log.ErrorFormat("{0}: Failure registering actor", LogHeader);
}
if (!m_scene.GridService.RegisterQuark(m_scene.RegionInfo.RegionID.ToString(), if (!m_scene.GridService.RegisterQuark(m_scene.RegionInfo.RegionID.ToString(),
m_scene.RegionInfo.SyncQuarkLocationX, m_scene.RegionInfo.SyncQuarkLocationY)) m_scene.RegionInfo.SyncQuarkLocationX, m_scene.RegionInfo.SyncQuarkLocationY))
{ {

7
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/ScenePersistenceSyncModule.cs
View File

@ -74,6 +74,13 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//register the module with SceneGraph. If needed, SceneGraph checks the module's ActorType to know what type of module it is. //register the module with SceneGraph. If needed, SceneGraph checks the module's ActorType to know what type of module it is.
m_scene.RegisterModuleInterface<IDSGActorSyncModule>(this); m_scene.RegisterModuleInterface<IDSGActorSyncModule>(this);
// register actor
if (!scene.GridService.RegisterActor(scene.RegionInfo.RegionID.ToString(),
"scene_persistence", scene.RegionInfo.RegionID.ToString()))
{
m_log.ErrorFormat("{0}: Failure registering actor", LogHeader);
}
// Setup the command line interface // Setup the command line interface
//m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; //m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
//InstallInterfaces(); //InstallInterfaces();