From ecb2305a04588a24c738b37121d0d915a6a37b04 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Tue, 30 Oct 2007 09:56:29 +0000
Subject: temporary fix for sitting collisions in ODE

---
 OpenSim/Region/ClientStack/ClientView.API.cs            | 13 -------------
 OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs |  5 ++---
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 7dcf1e8..bf2a678 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -835,19 +835,6 @@ namespace OpenSim.Region.ClientStack
             OutPacket(avatarReply);
         }
 
-        public void SendSitResponse(LLUUID targetID, LLVector3 offset)
-        {
-            AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket();
-
-            avatarSitResponse.SitObject.ID = targetID;
-
-            avatarSitResponse.SitTransform.AutoPilot = true;
-            avatarSitResponse.SitTransform.SitPosition = offset;
-            avatarSitResponse.SitTransform.SitRotation = new LLQuaternion(0.0f, 0.0f, 0.0f, 1.0f);
-
-            OutPacket(avatarSitResponse);
-        }
-
         #endregion
 
         #region Appearance/ Wearables Methods
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index dd2562c..7d1780c 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -200,12 +200,11 @@ namespace OpenSim.Region.ClientStack
                         }
                         break;
                     case PacketType.AgentRequestSit:
-                        AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket) Pack;
-                        SendSitResponse(agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
                         if (OnAgentRequestSit != null)
                         {
+                            AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket)Pack;
                             OnAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
-                                              agentRequestSit.TargetObject.TargetID);
+                                              agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
                         }
                         break;
                     case PacketType.AgentSit:
-- 
cgit v1.1