aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs34
1 files changed, 28 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index e2cb3ac..099d0f0 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -99,6 +99,11 @@ namespace OpenSim.Region.Environment.Scenes
99 // TODO: This needs to be persisted in next XML version update! 99 // TODO: This needs to be persisted in next XML version update!
100 [XmlIgnore] public int[] PayPrice = {0,0,0,0,0}; 100 [XmlIgnore] public int[] PayPrice = {0,0,0,0,0};
101 101
102
103 [XmlIgnore] public bool m_IsAttachment = false;
104 [XmlIgnore] public uint m_attachmentPoint = (byte)0;
105 [XmlIgnore] public LLUUID m_attachedAvatar = LLUUID.Zero;
106
102 public Int32 CreationDate; 107 public Int32 CreationDate;
103 public uint ParentID = 0; 108 public uint ParentID = 0;
104 109
@@ -1271,7 +1276,17 @@ namespace OpenSim.Region.Environment.Scenes
1271 } 1276 }
1272 return returnresult; 1277 return returnresult;
1273 } 1278 }
1279
1280 // Use this for attachments! LocalID should be avatar's localid
1281 public void SetParentLocalId(uint localID)
1282 {
1283 ParentID = localID;
1284 }
1274 1285
1286 public void SetAttachmentPoint(uint AttachmentPoint)
1287 {
1288 m_attachmentPoint = AttachmentPoint;
1289 }
1275 /// <summary> 1290 /// <summary>
1276 /// 1291 ///
1277 /// </summary> 1292 /// </summary>
@@ -2212,7 +2227,7 @@ namespace OpenSim.Region.Environment.Scenes
2212 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; 2227 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
2213 remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, clientFlags, m_uuid, 2228 remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, clientFlags, m_uuid,
2214 OwnerID, 2229 OwnerID,
2215 m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation); 2230 m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint);
2216 } 2231 }
2217 2232
2218 /// Terse updates 2233 /// Terse updates
@@ -2271,15 +2286,22 @@ namespace OpenSim.Region.Environment.Scenes
2271 public void SendTerseUpdateToClient(IClientAPI remoteClient, LLVector3 lPos) 2286 public void SendTerseUpdateToClient(IClientAPI remoteClient, LLVector3 lPos)
2272 { 2287 {
2273 LLQuaternion mRot = RotationOffset; 2288 LLQuaternion mRot = RotationOffset;
2274 if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0) 2289 if (m_IsAttachment)
2275 { 2290 {
2276 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Shape.State); 2291 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, (byte)(((byte)m_attachmentPoint) << 4));
2277 } 2292 }
2278 else 2293 else
2279 { 2294 {
2280 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, 2295 if ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) == 0)
2281 RotationalVelocity); 2296 {
2282 //System.Console.WriteLine("LID: " + LocalID + "RVel:" + RotationalVelocity.ToString() + " TD: " + ((ushort)(m_parentGroup.Scene.TimeDilation * 500000f)).ToString() + ":" + m_parentGroup.Scene.TimeDilation.ToString()); 2297 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Shape.State);
2298 }
2299 else
2300 {
2301 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity,
2302 RotationalVelocity);
2303 //System.Console.WriteLine("LID: " + LocalID + "RVel:" + RotationalVelocity.ToString() + " TD: " + ((ushort)(m_parentGroup.Scene.TimeDilation * 500000f)).ToString() + ":" + m_parentGroup.Scene.TimeDilation.ToString());
2304 }
2283 } 2305 }
2284 } 2306 }
2285 2307