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

Added reporting of LocalFlags property update in a few more spaces.

dsg
Huaiyu (Kitty) Liu 2011-05-25 16:27:32 -07:00
parent 8fa03afb5c
commit d79a37e0ca
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1099,8 +1099,17 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
// debugMsg += ", ChildPart, "; // debugMsg += ", ChildPart, ";
debugMsg += "ParentId = " + part.ParentID; debugMsg += "ParentId = " + part.ParentID;
debugMsg += ", GroupPos " + part.GroupPosition + ", offset-position " + part.OffsetPosition; debugMsg += ", GroupPos " + part.GroupPosition + ", offset-position " + part.OffsetPosition;
if (part.IsAttachment)
{
debugMsg += ", AttachedAvatar=" + part.AttachedAvatar + ", AttachmentPoint = " + part.AttachmentPoint; debugMsg += ", AttachedAvatar=" + part.AttachedAvatar + ", AttachmentPoint = " + part.AttachmentPoint;
debugMsg += ", AttachedPos = " + part.AttachedPos; debugMsg += ", AttachedPos = " + part.AttachedPos;
}
debugMsg += ", Flags = " + part.Flags.ToString();
debugMsg += ", LocalFlags = " + part.LocalFlags.ToString();
if (part.Text != String.Empty)
{
debugMsg += ", Text = " + part.Text+", Color = "+part.Color.ToString();
}
ScenePresence sp = m_scene.GetScenePresence(part.AttachedAvatar); ScenePresence sp = m_scene.GetScenePresence(part.AttachedAvatar);
if (sp != null) if (sp != null)

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

@ -1258,7 +1258,8 @@ namespace OpenSim.Region.Framework.Scenes
} }
//ScheduleGroupForFullUpdate(); //ScheduleGroupForFullUpdate();
ScheduleGroupForFullUpdate(new List<SceneObjectPartSyncProperties>(){ SceneObjectPartSyncProperties.Flags, SceneObjectPartSyncProperties.AggregateScriptEvents}); //do we also need to synchronize SOG properties such as m_scriptListens_atRotTarget? (does any acotr other than script engine care about it?) ScheduleGroupForFullUpdate(new List<SceneObjectPartSyncProperties>(){ SceneObjectPartSyncProperties.Flags, SceneObjectPartSyncProperties.LocalFlags,
SceneObjectPartSyncProperties.AggregateScriptEvents}); //do we also need to synchronize SOG properties such as m_scriptListens_atRotTarget? (does any acotr other than script engine care about it?)
} }
public void SetText(string text, Vector3 color, double alpha) public void SetText(string text, Vector3 color, double alpha)

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

@ -3699,6 +3699,7 @@ namespace OpenSim.Region.Framework.Scenes
(int) (color.Y*0xff), (int) (color.Y*0xff),
(int) (color.Z*0xff)); (int) (color.Z*0xff));
SetText(text); SetText(text);
ScheduleFullUpdate(new List<SceneObjectPartSyncProperties>() { SceneObjectPartSyncProperties.Color, SceneObjectPartSyncProperties.Text });
} }
public void StopMoveToTarget() public void StopMoveToTarget()
@ -4771,7 +4772,8 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.DebugFormat( // m_log.DebugFormat(
// "[SCENE OBJECT PART]: Scheduling part {0} {1} for full update in aggregateScriptEvents() since m_parentGroup == null", Name, LocalId); // "[SCENE OBJECT PART]: Scheduling part {0} {1} for full update in aggregateScriptEvents() since m_parentGroup == null", Name, LocalId);
//ScheduleFullUpdate(); //ScheduleFullUpdate();
ScheduleFullUpdate(new List<SceneObjectPartSyncProperties>() { SceneObjectPartSyncProperties.Flags, SceneObjectPartSyncProperties.AggregateScriptEvents}); ScheduleFullUpdate(new List<SceneObjectPartSyncProperties>() { SceneObjectPartSyncProperties.Flags, SceneObjectPartSyncProperties.LocalFlags,
SceneObjectPartSyncProperties.AggregateScriptEvents });
return; return;
} }