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

Commented out debug messages for VolumnDetect sync and collisions. 

Took out the warning message when reported collided SOP/SP is no
longer is local Scene.
dsg
Huaiyu (Kitty) Liu 2011-06-02 10:58:39 -07:00
parent b03ecf24c4
commit ee7b965bf9
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1551,12 +1551,11 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
List<SceneObjectPartSyncProperties> propertiesUpdated = m_primSyncInfoManager.UpdatePrimSyncInfoBySync(sop, propertiesSyncInfo); List<SceneObjectPartSyncProperties> propertiesUpdated = m_primSyncInfoManager.UpdatePrimSyncInfoBySync(sop, propertiesSyncInfo);
//SYNC DEBUG //SYNC DEBUG
/*
if (propertiesUpdated.Contains(SceneObjectPartSyncProperties.AggregateScriptEvents)) if (propertiesUpdated.Contains(SceneObjectPartSyncProperties.AggregateScriptEvents))
{ {
m_log.DebugFormat("AggregateScriptEvents updated: " + sop.AggregateScriptEvents); m_log.DebugFormat("AggregateScriptEvents updated: " + sop.AggregateScriptEvents);
} }
/*
if (propertiesUpdated.Contains(SceneObjectPartSyncProperties.Shape)) if (propertiesUpdated.Contains(SceneObjectPartSyncProperties.Shape))
{ {
String hashedShape = Util.Md5Hash((PropertySerializer.SerializeShape(sop))); String hashedShape = Util.Md5Hash((PropertySerializer.SerializeShape(sop)));
@ -2170,8 +2169,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
ScenePresence sp = m_scene.GetScenePresence(collidingUUID); ScenePresence sp = m_scene.GetScenePresence(collidingUUID);
if (sp == null) if (sp == null)
{ {
m_log.WarnFormat("Received collision event for SOP {0},{1} with another SOP/SP {2}, but the latter is not found in local Scene", //m_log.WarnFormat("Received collision event for SOP {0},{1} with another SOP/SP {2}, but the latter is not found in local Scene",
part.Name, part.UUID, collidingUUID); // part.Name, part.UUID, collidingUUID);
} }
else else
{ {
@ -2607,12 +2606,12 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//m_log.DebugFormat("{0}: SendPrimPropertyUpdates for {1}, {2}, with updated properties -- {3}", LogHeader, sop.Name, sop.UUID, pString); //m_log.DebugFormat("{0}: SendPrimPropertyUpdates for {1}, {2}, with updated properties -- {3}", LogHeader, sop.Name, sop.UUID, pString);
//DSG DEBUG //DSG DEBUG
/*
if (updatedProperties.Contains(SceneObjectPartSyncProperties.AggregateScriptEvents)) if (updatedProperties.Contains(SceneObjectPartSyncProperties.AggregateScriptEvents))
{ {
m_log.DebugFormat("SendPrimPropertyUpdates -- prim {0}: AggregateScriptEvents: {1} ", sop.Name, sop.AggregateScriptEvents); m_log.DebugFormat("SendPrimPropertyUpdates -- prim {0}: AggregateScriptEvents: {1} ", sop.Name, sop.AggregateScriptEvents);
} }
/*
if (updatedProperties.Contains(SceneObjectPartSyncProperties.Position)) if (updatedProperties.Contains(SceneObjectPartSyncProperties.Position))
{ {
m_log.DebugFormat("SendPrimPropertyUpdates -- prim {0}: Position: {1} ", sop.Name, sop.PhysActor.Position); m_log.DebugFormat("SendPrimPropertyUpdates -- prim {0}: Position: {1} ", sop.Name, sop.PhysActor.Position);
@ -2696,7 +2695,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
} }
//DSG DEBUG //DSG DEBUG
m_log.DebugFormat("calling AddNewSceneObjectByDecoding for SOG {0}, {1}", group.Name, group.UUID); //m_log.DebugFormat("calling AddNewSceneObjectByDecoding for SOG {0}, {1}", group.Name, group.UUID);
//Add the list of PrimSyncInfo to PrimSyncInfoManager's record. //Add the list of PrimSyncInfo to PrimSyncInfoManager's record.
m_primSyncInfoManager.InsertMultiPrimSyncInfo(primsSyncInfo); m_primSyncInfoManager.InsertMultiPrimSyncInfo(primsSyncInfo);
@ -4250,7 +4249,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
propertyUpdatedByLocal = true; propertyUpdatedByLocal = true;
//TEMP DEBUG //TEMP DEBUG
DebugLog.DebugFormat("CompareValue_UpdateByLocal -- copy SOP's AggregateScriptEvents {0}", part.AggregateScriptEvents); //DebugLog.DebugFormat("CompareValue_UpdateByLocal -- copy SOP's AggregateScriptEvents {0}", part.AggregateScriptEvents);
} }
else if (lastUpdateByLocalTS < m_propertiesSyncInfo[property].LastUpdateTimeStamp) else if (lastUpdateByLocalTS < m_propertiesSyncInfo[property].LastUpdateTimeStamp)
{ {
@ -5541,7 +5540,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
/////////////////////// ///////////////////////
case SceneObjectPartSyncProperties.AggregateScriptEvents: case SceneObjectPartSyncProperties.AggregateScriptEvents:
part.AggregateScriptEvents = (scriptEvents)pSyncInfo.LastUpdateValue; part.AggregateScriptEvents = (scriptEvents)pSyncInfo.LastUpdateValue;
DebugLog.DebugFormat("set {0} value to be {1}", property.ToString(), part.AggregateScriptEvents); //DebugLog.DebugFormat("set {0} value to be {1}", property.ToString(), part.AggregateScriptEvents);
part.aggregateScriptEventSubscriptions(); part.aggregateScriptEventSubscriptions();
break; break;
@ -5753,10 +5752,12 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
case SceneObjectPartSyncProperties.VolumeDetectActive: case SceneObjectPartSyncProperties.VolumeDetectActive:
//part.ParentGroup.UpdatePrimFlagsBySync(part.LocalId, part., IsTemporary, IsPhantom, part.VolumeDetectActive); //part.ParentGroup.UpdatePrimFlagsBySync(part.LocalId, part., IsTemporary, IsPhantom, part.VolumeDetectActive);
bool isVD = (bool)pSyncInfo.LastUpdateValue; bool isVD = (bool)pSyncInfo.LastUpdateValue;
DebugLog.DebugFormat("VolumeDetectActive updated on SOP {0}, to {1}", part.Name, isVD); //VD DEBUG
//DebugLog.DebugFormat("VolumeDetectActive updated on SOP {0}, to {1}", part.Name, isVD);
if (part.ParentGroup != null) if (part.ParentGroup != null)
{ {
DebugLog.DebugFormat("calling ScriptSetVolumeDetectBySync"); //VD DEBUG
//DebugLog.DebugFormat("calling ScriptSetVolumeDetectBySync");
part.ParentGroup.ScriptSetVolumeDetectBySync(isVD); part.ParentGroup.ScriptSetVolumeDetectBySync(isVD);
} }
part.VolumeDetectActive = isVD; part.VolumeDetectActive = isVD;

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

@ -3935,7 +3935,7 @@ namespace OpenSim.Region.Framework.Scenes
public void ScriptSetVolumeDetectBySync(bool SetVD) public void ScriptSetVolumeDetectBySync(bool SetVD)
{ {
m_log.DebugFormat("ScriptSetVolumeDetectBySync called for SOG {0}", Name); //m_log.DebugFormat("ScriptSetVolumeDetectBySync called for SOG {0}", Name);
bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0); bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0);
bool IsTemporary = ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0); bool IsTemporary = ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0);

35
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -4417,11 +4417,12 @@ namespace OpenSim.Region.Framework.Scenes
if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD)) if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD))
{ {
m_log.DebugFormat("UpdatePrimFlags called on {0}, nothing changed", Name); //m_log.DebugFormat("UpdatePrimFlags called on {0}, nothing changed", Name);
return; return;
} }
m_log.DebugFormat("UpdatePrimFlags for SOP {0}, with args UsePhysics ={1}, IsTemporary= {2}, IsPhantom= {3}, IsVD = {4}", Name, UsePhysics, IsTemporary, IsPhantom, IsVD); //DSG VD DEBUG
//m_log.DebugFormat("UpdatePrimFlags for SOP {0}, with args UsePhysics ={1}, IsTemporary= {2}, IsPhantom= {3}, IsVD = {4}", Name, UsePhysics, IsTemporary, IsPhantom, IsVD);
// Special cases for VD. VD can only be called from a script // Special cases for VD. VD can only be called from a script
// and can't be combined with changes to other states. So we can rely // and can't be combined with changes to other states. So we can rely
@ -4430,8 +4431,6 @@ namespace OpenSim.Region.Framework.Scenes
// ... if one of the others is changed, VD is not. // ... if one of the others is changed, VD is not.
if (IsVD) // VD is active, special logic applies if (IsVD) // VD is active, special logic applies
{ {
m_log.DebugFormat("VolumnDetectActive is set");
// State machine logic for VolumeDetect // State machine logic for VolumeDetect
// More logic below // More logic below
bool phanReset = (IsPhantom != wasPhantom) && !IsPhantom; bool phanReset = (IsPhantom != wasPhantom) && !IsPhantom;
@ -4505,8 +4504,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
// It's not phantom anymore. So make sure the physics engine get's knowledge of it // It's not phantom anymore. So make sure the physics engine get's knowledge of it
m_log.DebugFormat("Create PhysActor for {0}", Name);
PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
LocalId, LocalId,
string.Format("{0}/{1}", Name, UUID), string.Format("{0}/{1}", Name, UUID),
@ -4567,8 +4564,6 @@ namespace OpenSim.Region.Framework.Scenes
if (IsVD) if (IsVD)
{ {
m_log.DebugFormat("more logic on VD");
// If the above logic worked (this is urgent candidate to unit tests!) // If the above logic worked (this is urgent candidate to unit tests!)
// we now have a physicsactor. // we now have a physicsactor.
// Defensive programming calls for a check here. // Defensive programming calls for a check here.
@ -4576,8 +4571,6 @@ namespace OpenSim.Region.Framework.Scenes
// logic should make sure, this Physactor is always here. // logic should make sure, this Physactor is always here.
if (this.PhysActor != null) if (this.PhysActor != null)
{ {
m_log.DebugFormat("PhysActor.SetVolumnDetect");
PhysActor.SetVolumeDetect(1); PhysActor.SetVolumeDetect(1);
AddFlag(PrimFlags.Phantom); // We set this flag also if VD is active AddFlag(PrimFlags.Phantom); // We set this flag also if VD is active
this.VolumeDetectActive = true; this.VolumeDetectActive = true;
@ -4607,7 +4600,7 @@ namespace OpenSim.Region.Framework.Scenes
ParentGroup.HasGroupChanged = true; ParentGroup.HasGroupChanged = true;
//ScheduleFullUpdate(); //ScheduleFullUpdate();
ScheduleFullUpdate(new List<SceneObjectPartSyncProperties>() { SceneObjectPartSyncProperties.Flags}); ScheduleFullUpdate(new List<SceneObjectPartSyncProperties>() { SceneObjectPartSyncProperties.Flags, SceneObjectPartSyncProperties.VolumeDetectActive});
} }
public void UpdateRotation(Quaternion rot) public void UpdateRotation(Quaternion rot)
@ -5357,12 +5350,14 @@ namespace OpenSim.Region.Framework.Scenes
(CollisionSound != UUID.Zero) (CollisionSound != UUID.Zero)
) )
{ {
m_log.DebugFormat("Need to Hook up collision events for {0} ", Name); //DSG collision DEBUG
//m_log.DebugFormat("Need to Hook up collision events for {0} ", Name);
// subscribe to physics updates. // subscribe to physics updates.
if (PhysActor != null) if (PhysActor != null)
{ {
m_log.DebugFormat("Hook up with PhysicsCollision for {0} ", Name); //DSG collision DEBUG
//m_log.DebugFormat("Hook up with PhysicsCollision for {0} ", Name);
PhysActor.OnCollisionUpdate += PhysicsCollision; PhysActor.OnCollisionUpdate += PhysicsCollision;
PhysActor.SubscribeEvents(1000); PhysActor.SubscribeEvents(1000);
@ -5409,11 +5404,12 @@ namespace OpenSim.Region.Framework.Scenes
bool wasPhantom = ((Flags & PrimFlags.Phantom) != 0); bool wasPhantom = ((Flags & PrimFlags.Phantom) != 0);
bool wasVD = VolumeDetectActive; bool wasVD = VolumeDetectActive;
m_log.DebugFormat("UpdatePrimFlagsBySync called for SOP {0}, UsePhysics ={1}, IsTemporary= {2}, IsPhantom= {3}, IsVD = {4}", Name, UsePhysics, IsTemporary, IsPhantom, IsVD); //DSG VD DEBUG
//m_log.DebugFormat("UpdatePrimFlagsBySync called for SOP {0}, UsePhysics ={1}, IsTemporary= {2}, IsPhantom= {3}, IsVD = {4}", Name, UsePhysics, IsTemporary, IsPhantom, IsVD);
if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD == wasVD)) if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD == wasVD))
{ {
m_log.DebugFormat("no property changed, return"); //m_log.DebugFormat("no property changed, return");
return; return;
} }
@ -5424,11 +5420,13 @@ namespace OpenSim.Region.Framework.Scenes
// ... if one of the others is changed, VD is not. // ... if one of the others is changed, VD is not.
if (IsVD) // VD is active, special logic applies if (IsVD) // VD is active, special logic applies
{ {
/*
m_log.DebugFormat("{0}: IsVD", Name); m_log.DebugFormat("{0}: IsVD", Name);
if (PhysActor == null) if (PhysActor == null)
{ {
m_log.WarnFormat("But {0}'s PhysActor is null", Name); m_log.WarnFormat("But {0}'s PhysActor is null", Name);
} }
*/
// State machine logic for VolumeDetect // State machine logic for VolumeDetect
// More logic below // More logic below
@ -5501,8 +5499,8 @@ namespace OpenSim.Region.Framework.Scenes
PhysicsActor pa = PhysActor; PhysicsActor pa = PhysActor;
if (pa == null) if (pa == null)
{ {
//DSG DEBUG //DSG VD DEBUG
m_log.DebugFormat("Creating PhysActor for SOP {0}, {1}, so far Flags = {2}", Name, UUID, Flags.ToString()); //m_log.DebugFormat("Creating PhysActor for SOP {0}, {1}, so far Flags = {2}", Name, UUID, Flags.ToString());
// It's not phantom anymore. So make sure the physics engine get's knowledge of it // It's not phantom anymore. So make sure the physics engine get's knowledge of it
PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
@ -5602,7 +5600,8 @@ namespace OpenSim.Region.Framework.Scenes
ParentGroup.HasGroupChanged = true; ParentGroup.HasGroupChanged = true;
//ScheduleFullUpdate(); //ScheduleFullUpdate();
m_log.DebugFormat("End of UpdatePrimFlagsBySync for SOP {0}, {1}, so far Flags = {2}", Name, UUID, Flags.ToString()); //DSG VD DEBUG
//m_log.DebugFormat("End of UpdatePrimFlagsBySync for SOP {0}, {1}, so far Flags = {2}", Name, UUID, Flags.ToString());
//caller will trigger this, See SetSOPFlags() //caller will trigger this, See SetSOPFlags()
//ScheduleFullUpdate(null); //ScheduleFullUpdate(null);