From 441551e7c6df96bb3e11d62c5af36202b50ddf99 Mon Sep 17 00:00:00 2001 From: "Huaiyu (Kitty) Liu" Date: Wed, 26 Jan 2011 16:39:18 -0800 Subject: [PATCH] Commented out debug messages in enabling LinkObject synchronization. --- .../RegionSyncModule/SymmetricSync/RegionSyncModule.cs | 6 ++---- OpenSim/Region/Framework/Scenes/Scene.cs | 7 +++++-- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 4 ++-- .../Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs index 6e1ba52386..70d7c6dd27 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs @@ -1073,8 +1073,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule { Scene.ObjectUpdateResult updateResult = m_scene.AddOrUpdateObjectBySynchronization(sog); - m_log.Debug(LogHeader + " handle update message of object " + sog.UUID); - //if (added) switch (updateResult) { @@ -1348,7 +1346,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule /// OSDMap data of event args private void HandleRemoteEvent_OnChatFromClient(string actorID, ulong evSeqNum, OSDMap data) { - m_log.Debug(LogHeader + ", " + m_actorID + ": received ChatFromClient from "+actorID+", seq "+evSeqNum); + //m_log.Debug(LogHeader + ": received ChatFromClient from "+actorID+", seq "+evSeqNum); OSChatMessage args = new OSChatMessage(); args.Channel = data["channel"].AsInteger(); @@ -1368,7 +1366,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule private void HandleRemoteEvent_OnChatFromWorld(string actorID, ulong evSeqNum, OSDMap data) { - m_log.Debug(LogHeader + ", " + m_actorID + ": received ChatFromWorld from " + actorID + ", seq " + evSeqNum); + //m_log.Debug(LogHeader + ", " + m_actorID + ": received ChatFromWorld from " + actorID + ", seq " + evSeqNum); OSChatMessage args = new OSChatMessage(); args.Channel = data["channel"].AsInteger(); diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 88b848d6ad..40c37f3e1e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -757,8 +757,8 @@ namespace OpenSim.Region.Framework.Scenes /// public void LinkObjectBySync(SceneObjectGroup linkedGroup, UUID rootID, List childrenIDs) { - m_log.Debug("Start to LinkObjectBySync"); - DebugSceneObjectGroups(); + //m_log.Debug("Start to LinkObjectBySync"); + //DebugSceneObjectGroups(); List children = new List(); SceneObjectPart root = GetSceneObjectPart(rootID); @@ -793,16 +793,19 @@ namespace OpenSim.Region.Framework.Scenes //The properties of the newly linked object should be updated later with another UpdatedObject message. //Set the property values as in the incoming copy of the object group + SceneObjectGroup localGroup = root.ParentGroup; localGroup.UpdateObjectProperties(linkedGroup); //debug + /* m_log.Debug("after SceneGraph.LinkObjectsBySync, the newly linked group is \n" + root.ParentGroup.DebugObjectUpdateResult()); m_log.Debug("parts before linking now have properties: "); foreach (SceneObjectPart part in children) { m_log.Debug(part.DebugObjectPartProperties()); } + * */ } #endregion //SYMMETRIC SYNC diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index ec7b18e679..d37fcfbb14 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -1989,8 +1989,8 @@ namespace OpenSim.Region.Framework.Scenes } //Debug - m_log.Debug("after AddOrUpdateObjectBySynchronization"); - m_parentScene.DebugSceneObjectGroups(); + //m_log.Debug("after AddOrUpdateObjectBySynchronization"); + //m_parentScene.DebugSceneObjectGroups(); return updateResult; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 28fdffbb46..035442c88f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs @@ -675,7 +675,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance return 0; } - m_log.DebugFormat("[Script] processing event {2} in state {3} to {0}.{1}, localID-{4}", m_PrimName, m_ScriptName, data.EventName, m_State, m_LocalID); + //m_log.DebugFormat("[Script] processing event {2} in state {3} to {0}.{1}, localID-{4}", m_PrimName, m_ScriptName, data.EventName, m_State, m_LocalID); if (data.EventName == "timer") @@ -788,7 +788,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance } } - m_log.DebugFormat("[Script] processing event {2} in state {3} to {0}.{1}, localID -{4}; to trigger QueueEventHandler", m_PrimName, m_ScriptName, data.EventName, m_State, m_LocalID); + //m_log.DebugFormat("[Script] processing event {2} in state {3} to {0}.{1}, localID -{4}; to trigger QueueEventHandler", m_PrimName, m_ScriptName, data.EventName, m_State, m_LocalID); lock (m_EventQueue) {