From 42645acab9a06a126e20d2a6abce49f413b60d5b Mon Sep 17 00:00:00 2001 From: "Huaiyu (Kitty) Liu" Date: Tue, 4 Jan 2011 14:19:44 -0800 Subject: [PATCH] Fix a bug and link-set objects can now be synched correctly. --- .../RegionSync/RegionSyncModule/RegionSyncServerModule.cs | 4 ++-- .../RegionSyncModule/SymmetricSync/RegionSyncModule.cs | 2 +- .../Framework/Scenes/Serialization/SceneObjectSerializer.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs index fc56777a0b..77fdf24b31 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs @@ -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 //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) 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 //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); } } diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs index 70b2d69f46..586fdf16a5 100755 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs @@ -774,7 +774,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule string sogxml = SceneObjectSerializer.ToXml2Format((SceneObjectGroup)e); SendSyncMessage(SymmetricSyncMessage.MsgType.NewObject, sogxml); - //m_log.Debug(LogHeader + ": " + sogxml); + m_log.Debug(LogHeader + ": " + sogxml); } } return; diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index efadf8dedf..8953ce31ba 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs @@ -217,7 +217,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization //SYMMETRIC SYNC //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. // We override that here