diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 50c96e1..0db9b91 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -104,6 +104,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
104 | [XmlIgnore] public uint m_attachmentPoint = (byte)0; | 104 | [XmlIgnore] public uint m_attachmentPoint = (byte)0; |
105 | [XmlIgnore] public LLUUID m_attachedAvatar = LLUUID.Zero; | 105 | [XmlIgnore] public LLUUID m_attachedAvatar = LLUUID.Zero; |
106 | [XmlIgnore] public LLVector3 m_attachedPos = LLVector3.Zero; | 106 | [XmlIgnore] public LLVector3 m_attachedPos = LLVector3.Zero; |
107 | [XmlIgnore] public LLUUID fromAssetID = LLUUID.Zero; | ||
107 | 108 | ||
108 | public Int32 CreationDate; | 109 | public Int32 CreationDate; |
109 | public uint ParentID = 0; | 110 | public uint ParentID = 0; |
@@ -2251,7 +2252,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2251 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; | 2252 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; |
2252 | remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, clientFlags, m_uuid, | 2253 | remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, clientFlags, m_uuid, |
2253 | OwnerID, | 2254 | OwnerID, |
2254 | m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint); | 2255 | m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID); |
2255 | } | 2256 | } |
2256 | 2257 | ||
2257 | /// Terse updates | 2258 | /// Terse updates |
@@ -2297,7 +2298,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2297 | LLQuaternion mRot = RotationOffset; | 2298 | LLQuaternion mRot = RotationOffset; |
2298 | if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0) | 2299 | if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0) |
2299 | { | 2300 | { |
2300 | remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Shape.State); | 2301 | remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Shape.State, fromAssetID); |
2301 | } | 2302 | } |
2302 | else | 2303 | else |
2303 | { | 2304 | { |
@@ -2312,13 +2313,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
2312 | LLQuaternion mRot = RotationOffset; | 2313 | LLQuaternion mRot = RotationOffset; |
2313 | if (m_IsAttachment) | 2314 | if (m_IsAttachment) |
2314 | { | 2315 | { |
2315 | remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, (byte)((m_attachmentPoint % 16) * 16 + (m_attachmentPoint / 16))); | 2316 | remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, (byte)((m_attachmentPoint % 16) * 16 + (m_attachmentPoint / 16)),fromAssetID); |
2316 | } | 2317 | } |
2317 | else | 2318 | else |
2318 | { | 2319 | { |
2319 | if ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) == 0) | 2320 | if ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) == 0) |
2320 | { | 2321 | { |
2321 | remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Shape.State); | 2322 | remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Shape.State, fromAssetID); |
2322 | } | 2323 | } |
2323 | else | 2324 | else |
2324 | { | 2325 | { |