From a7b5fe6a889a63acefbd91cd89e0a99c2a8d4162 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 14 Jul 2010 19:21:01 +0200
Subject: Remove useless quaternion parameter from AttachObject sig
---
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 540fccc..2a21b02 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5731,7 +5731,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
if (att.ObjectData.Length > 0)
{
- handlerObjectAttach(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, att.ObjectData[0].Rotation, false);
+ handlerObjectAttach(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, false);
}
}
}
--
cgit v1.1
From e1ea82b329b9346ccacb1edd25a0e2b44f07e8c8 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 14 Jul 2010 19:51:12 +0100
Subject: Major attachments cleanup. Remove unused AttachObject ClientView
method Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
---
.../Region/ClientStack/LindenUDP/LLClientView.cs | 24 ----------------------
1 file changed, 24 deletions(-)
(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 2a21b02..0aec01a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3678,30 +3678,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#endregion Primitive Packet/Data Sending Methods
- ///
- ///
- ///
- ///
- ///
- ///
- public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
- {
- if (attachPoint > 30 && ownerID != AgentId) // Someone else's HUD
- return;
-
- ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach);
- // TODO: don't create new blocks if recycling an old packet
- attach.AgentData.AgentID = AgentId;
- attach.AgentData.SessionID = m_sessionId;
- attach.AgentData.AttachmentPoint = attachPoint;
- attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
- attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
- attach.ObjectData[0].ObjectLocalID = localID;
- attach.ObjectData[0].Rotation = rotation;
- attach.Header.Zerocoded = true;
- OutPacket(attach, ThrottleOutPacketType.Task);
- }
-
void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories)
{
if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
--
cgit v1.1