From 3d1048f1e2d4ff079afa0bd17299774ddd9e24cc Mon Sep 17 00:00:00 2001 From: "Huaiyu (Kitty) Liu" Date: Wed, 16 Feb 2011 16:57:47 -0800 Subject: [PATCH] In SOG.UpdateGroupPosition, added AttachedPos as an updated property is the object is an attachment. --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 7 ++++++- .../Scenes/Serialization/SceneObjectSerializer.cs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 36f033c824..5120e90783 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2909,7 +2909,12 @@ namespace OpenSim.Region.Framework.Scenes //we need to do a terse update even if the move wasn't allowed // so that the position is reset in the client (the object snaps back) //ScheduleGroupForTerseUpdate(); - ScheduleGroupForTerseUpdate(new List(){SceneObjectPartProperties.GroupPosition}); + List updatedProperties = new List() { SceneObjectPartProperties.GroupPosition }; + if (IsAttachment) + { + updatedProperties.Add(SceneObjectPartProperties.AttachedPos); + } + ScheduleGroupForTerseUpdate(updatedProperties); } /// diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 9e8276e322..170c45a030 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs @@ -1288,7 +1288,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization WriteUUID(writer, "AttachedAvatar", sop.AttachedAvatar, options); WriteVector(writer, "AttachedPos", sop.AttachedPos); writer.WriteElementString("AttachmentPoint", sop.AttachmentPoint.ToString()); - writer.WriteElementString("IsAttachment", sop.IsAttachment.ToString().ToLower()); //IsAttachment is written last, so that on deserialization, it will be deserialized later than other Attachment properties + //writer.WriteElementString("IsAttachment", sop.IsAttachment.ToString().ToLower()); //IsAttachment is written last, so that on deserialization, it will be deserialized later than other Attachment properties WriteFlags(writer, "AggregateScriptEvents", sop.AggregateScriptEvents.ToString(), options); WriteBucketSyncInfo(writer, sop.BucketSyncInfoList); //end of SYMMETRIC SYNC