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

Commented out debug messages in enabling LinkObject synchronization.

dsg
Huaiyu (Kitty) Liu 2011-01-26 16:39:18 -08:00
parent 101d67c45b
commit 441551e7c6
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1073,8 +1073,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{ {
Scene.ObjectUpdateResult updateResult = m_scene.AddOrUpdateObjectBySynchronization(sog); Scene.ObjectUpdateResult updateResult = m_scene.AddOrUpdateObjectBySynchronization(sog);
m_log.Debug(LogHeader + " handle update message of object " + sog.UUID);
//if (added) //if (added)
switch (updateResult) switch (updateResult)
{ {
@ -1348,7 +1346,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
/// <param name="data">OSDMap data of event args</param> /// <param name="data">OSDMap data of event args</param>
private void HandleRemoteEvent_OnChatFromClient(string actorID, ulong evSeqNum, OSDMap data) 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(); OSChatMessage args = new OSChatMessage();
args.Channel = data["channel"].AsInteger(); 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) 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(); OSChatMessage args = new OSChatMessage();
args.Channel = data["channel"].AsInteger(); args.Channel = data["channel"].AsInteger();

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

@ -757,8 +757,8 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="childrenIDs"></param> /// <param name="childrenIDs"></param>
public void LinkObjectBySync(SceneObjectGroup linkedGroup, UUID rootID, List<UUID> childrenIDs) public void LinkObjectBySync(SceneObjectGroup linkedGroup, UUID rootID, List<UUID> childrenIDs)
{ {
m_log.Debug("Start to LinkObjectBySync"); //m_log.Debug("Start to LinkObjectBySync");
DebugSceneObjectGroups(); //DebugSceneObjectGroups();
List<SceneObjectPart> children = new List<SceneObjectPart>(); List<SceneObjectPart> children = new List<SceneObjectPart>();
SceneObjectPart root = GetSceneObjectPart(rootID); 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. //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 //Set the property values as in the incoming copy of the object group
SceneObjectGroup localGroup = root.ParentGroup; SceneObjectGroup localGroup = root.ParentGroup;
localGroup.UpdateObjectProperties(linkedGroup); localGroup.UpdateObjectProperties(linkedGroup);
//debug //debug
/*
m_log.Debug("after SceneGraph.LinkObjectsBySync, the newly linked group is \n" + root.ParentGroup.DebugObjectUpdateResult()); m_log.Debug("after SceneGraph.LinkObjectsBySync, the newly linked group is \n" + root.ParentGroup.DebugObjectUpdateResult());
m_log.Debug("parts before linking now have properties: "); m_log.Debug("parts before linking now have properties: ");
foreach (SceneObjectPart part in children) foreach (SceneObjectPart part in children)
{ {
m_log.Debug(part.DebugObjectPartProperties()); m_log.Debug(part.DebugObjectPartProperties());
} }
* */
} }
#endregion //SYMMETRIC SYNC #endregion //SYMMETRIC SYNC

4
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -1989,8 +1989,8 @@ namespace OpenSim.Region.Framework.Scenes
} }
//Debug //Debug
m_log.Debug("after AddOrUpdateObjectBySynchronization"); //m_log.Debug("after AddOrUpdateObjectBySynchronization");
m_parentScene.DebugSceneObjectGroups(); //m_parentScene.DebugSceneObjectGroups();
return updateResult; return updateResult;
} }

4
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -675,7 +675,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
return 0; 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") 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) lock (m_EventQueue)
{ {