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

Fix a bug and link-set objects can now be synched correctly.

dsg
Huaiyu (Kitty) Liu 2011-01-04 14:19:44 -08:00
parent d84e69fefe
commit 42645acab9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -391,7 +391,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//when an object is deleted, this function (DeleteObject) could be triggered more than once. So we check //when an object is deleted, this function (DeleteObject) could be triggered more than once. So we check
//if the object part is already removed is the scene (part==null) //if the object part is already removed is the scene (part==null)
m_log.Debug("Inform script engine about the deleted object"); //m_log.Debug("Inform script engine about the deleted object");
if(m_sceneToSESyncServer!=null) if(m_sceneToSESyncServer!=null)
m_sceneToSESyncServer.SendToSE(rsm, part.ParentGroup); m_sceneToSESyncServer.SendToSE(rsm, part.ParentGroup);
} }
@ -572,7 +572,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//when an object is deleted, this function (DeleteObject) could be triggered more than once. So we check //when an object is deleted, this function (DeleteObject) could be triggered more than once. So we check
//if the object part is already removed is the scene (part==null) //if the object part is already removed is the scene (part==null)
m_log.Debug("Inform script engine about the deleted object"); //m_log.Debug("Inform script engine about the deleted object");
m_sceneToSESyncServer.SendToSE(rsm, part.ParentGroup); m_sceneToSESyncServer.SendToSE(rsm, part.ParentGroup);
} }
} }

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

@ -774,7 +774,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
string sogxml = SceneObjectSerializer.ToXml2Format((SceneObjectGroup)e); string sogxml = SceneObjectSerializer.ToXml2Format((SceneObjectGroup)e);
SendSyncMessage(SymmetricSyncMessage.MsgType.NewObject, sogxml); SendSyncMessage(SymmetricSyncMessage.MsgType.NewObject, sogxml);
//m_log.Debug(LogHeader + ": " + sogxml); m_log.Debug(LogHeader + ": " + sogxml);
} }
} }
return; return;

2
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -217,7 +217,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
//SYMMETRIC SYNC //SYMMETRIC SYNC
//KittyL: 12/27/2010, added ActorID for symmetric synch model //KittyL: 12/27/2010, added ActorID for symmetric synch model
part.SetLastUpdateActorID(); //part.SetLastUpdateActorID();
// SceneObjectGroup.AddPart() tries to be smart and automatically set the LinkNum. // SceneObjectGroup.AddPart() tries to be smart and automatically set the LinkNum.
// We override that here // We override that here