diff options
author | Melanie Thielker | 2010-07-14 19:58:23 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-07-14 19:58:23 +0200 |
commit | bebbe407ee166a0aa22f0ec8d14ada780924f9af (patch) | |
tree | 79e38927939a6e95ff4ff105b357a8d3888a67b8 /OpenSim/Region/ClientStack/LindenUDP | |
parent | Remove useless quaternion parameter from AttachObject sig (diff) | |
download | opensim-SC-bebbe407ee166a0aa22f0ec8d14ada780924f9af.zip opensim-SC-bebbe407ee166a0aa22f0ec8d14ada780924f9af.tar.gz opensim-SC-bebbe407ee166a0aa22f0ec8d14ada780924f9af.tar.bz2 opensim-SC-bebbe407ee166a0aa22f0ec8d14ada780924f9af.tar.xz |
Major attachments cleanup. Remove unused AttachObject ClientView method
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 82b9958..754127d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3687,30 +3687,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3687 | 3687 | ||
3688 | #endregion Primitive Packet/Data Sending Methods | 3688 | #endregion Primitive Packet/Data Sending Methods |
3689 | 3689 | ||
3690 | /// <summary> | ||
3691 | /// | ||
3692 | /// </summary> | ||
3693 | /// <param name="localID"></param> | ||
3694 | /// <param name="rotation"></param> | ||
3695 | /// <param name="attachPoint"></param> | ||
3696 | public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID) | ||
3697 | { | ||
3698 | if (attachPoint > 30 && ownerID != AgentId) // Someone else's HUD | ||
3699 | return; | ||
3700 | |||
3701 | ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach); | ||
3702 | // TODO: don't create new blocks if recycling an old packet | ||
3703 | attach.AgentData.AgentID = AgentId; | ||
3704 | attach.AgentData.SessionID = m_sessionId; | ||
3705 | attach.AgentData.AttachmentPoint = attachPoint; | ||
3706 | attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1]; | ||
3707 | attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock(); | ||
3708 | attach.ObjectData[0].ObjectLocalID = localID; | ||
3709 | attach.ObjectData[0].Rotation = rotation; | ||
3710 | attach.Header.Zerocoded = true; | ||
3711 | OutPacket(attach, ThrottleOutPacketType.Task); | ||
3712 | } | ||
3713 | |||
3714 | void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories) | 3690 | void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories) |
3715 | { | 3691 | { |
3716 | if ((categories & ThrottleOutPacketTypeFlags.Task) != 0) | 3692 | if ((categories & ThrottleOutPacketTypeFlags.Task) != 0) |