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

Changed the way RemoveObject is handled: now Scene.DeleteSceneObject() calls RegionSyncModule to 

send RemovedObject message to other actors for synchronization.
dsg
Huaiyu (Kitty) Liu 2011-01-13 15:36:44 -08:00
parent c1e19ead74
commit 0be2fe7f13
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//Register for local Scene events
m_scene.EventManager.OnPostSceneCreation += OnPostSceneCreation;
m_scene.EventManager.OnObjectBeingRemovedFromScene += new EventManager.ObjectBeingRemovedFromScene(RegionSyncModule_OnObjectBeingRemovedFromScene);
//m_scene.EventManager.OnObjectBeingRemovedFromScene += new EventManager.ObjectBeingRemovedFromScene(RegionSyncModule_OnObjectBeingRemovedFromScene);
}
@ -1273,7 +1273,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
/// only be triggered by an object removal that is initiated locally.
/// </summary>
/// <param name="sog"></param>
private void RegionSyncModule_OnObjectBeingRemovedFromScene(SceneObjectGroup sog)
//private void RegionSyncModule_OnObjectBeingRemovedFromScene(SceneObjectGroup sog)
public void SendDeleteObject(SceneObjectGroup sog)
{
//m_log.DebugFormat("RegionSyncModule_OnObjectBeingRemovedFromScene called at time {0}:{1}:{2}", DateTime.Now.Minute, DateTime.Now.Second, DateTime.Now.Millisecond);

2
OpenSim/Region/Framework/Interfaces/IRegionSyncModule.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Interfaces
//void SendUpdatesToSynchronizeState(List<SceneObjectGroup> sog);
void SendSceneUpdates();
void SendTerrainUpdates(string lastUpdateActorID);
//void SendDeleteObject(SceneObjectGroup sog);
void SendDeleteObject(SceneObjectGroup sog);
//For propogating scene events to other actors
void PublishSceneEvent(EventManager.EventNames ev, Object[] evArgs);

16
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -662,8 +662,7 @@ namespace OpenSim.Region.Framework.Scenes
if (UnlinkSceneObject(group, false))
{
//For object removals caused by remote events (by other actors), do not trigger local event ObjectBeingRemovedFromScene
//EventManager.TriggerObjectBeingRemovedFromScene(group);
EventManager.TriggerObjectBeingRemovedFromScene(group);
EventManager.TriggerParcelPrimCountTainted();
}
@ -2430,8 +2429,16 @@ namespace OpenSim.Region.Framework.Scenes
{
part.SyncInfoUpdate();
}
//end of SYMMETRIC SYNC
*
* */
//Propagate the RemovedObject message
if (RegionSyncModule != null)
{
RegionSyncModule.SendDeleteObject(group);
}
//end of SYMMETRIC SYNC
}
/// <summary>
@ -3592,9 +3599,12 @@ namespace OpenSim.Region.Framework.Scenes
ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); });
//SYMMETRIC SYNC: object remove should be handled through RegionSyncModule
// REGION SYNC
/*
if( IsSyncedServer() )
RegionSyncServerModule.DeleteObject(m_regionHandle, localID, part);
* */
}
#endregion

3
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1163,7 +1163,8 @@ namespace OpenSim.Region.Framework.Scenes
Scene.RegionSyncServerModule.DeleteObject(part.RegionHandle, part.LocalId, part);
//return;
}
* */
* */
//end of SYMMETRIC SYNC
Scene.ForEachScenePresence(delegate(ScenePresence avatar)
{