aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-25 09:47:21 +0000
committerTeravus Ovares2008-04-25 09:47:21 +0000
commit421730d972dca49ffd16b7dccd800b51ba5c20ac (patch)
tree75d76fe90487e9884e119e0c7ff0a69cff953d4e /OpenSim
parent* Implements llTarget, llTargetRemove, at_target(), not_at_target() (diff)
downloadopensim-SC_OLD-421730d972dca49ffd16b7dccd800b51ba5c20ac.zip
opensim-SC_OLD-421730d972dca49ffd16b7dccd800b51ba5c20ac.tar.gz
opensim-SC_OLD-421730d972dca49ffd16b7dccd800b51ba5c20ac.tar.bz2
opensim-SC_OLD-421730d972dca49ffd16b7dccd800b51ba5c20ac.tar.xz
* Used thomas' patch m884 as an example to make HUD attachments work. While I didn't use the patch directly, I did use the following from the patch to convert the uint value into the byte: (byte)((m_attachmentPoint % 16) * 16 + (m_attachmentPoint / 16))
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 5b9bfdb..db0b2cd 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2062,7 +2062,7 @@ namespace OpenSim.Region.ClientStack
2062 // Item from inventory??? 2062 // Item from inventory???
2063 outPacket.ObjectData[0].NameValue = 2063 outPacket.ObjectData[0].NameValue =
2064 Helpers.StringToField("AttachItemID STRING RW SV " + objectID.UUID); 2064 Helpers.StringToField("AttachItemID STRING RW SV " + objectID.UUID);
2065 outPacket.ObjectData[0].State = (byte)(((byte)AttachPoint) << 4); 2065 outPacket.ObjectData[0].State = (byte)((AttachPoint % 16) * 16 + (AttachPoint / 16));
2066 } 2066 }
2067 2067
2068 // Sound Radius 2068 // Sound Radius
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index f345dab..5c8e109 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -2288,7 +2288,7 @@ namespace OpenSim.Region.Environment.Scenes
2288 LLQuaternion mRot = RotationOffset; 2288 LLQuaternion mRot = RotationOffset;
2289 if (m_IsAttachment) 2289 if (m_IsAttachment)
2290 { 2290 {
2291 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, (byte)(((byte)m_attachmentPoint) << 4)); 2291 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, (byte)((m_attachmentPoint % 16) * 16 + (m_attachmentPoint / 16)));
2292 } 2292 }
2293 else 2293 else
2294 { 2294 {