aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJeff Ames2007-10-30 09:56:29 +0000
committerJeff Ames2007-10-30 09:56:29 +0000
commitecb2305a04588a24c738b37121d0d915a6a37b04 (patch)
tree34fb34431ef189ace026a6cb5f8df1ed7b8a4829 /OpenSim/Region/ClientStack
parent* Optimized usings (diff)
downloadopensim-SC_OLD-ecb2305a04588a24c738b37121d0d915a6a37b04.zip
opensim-SC_OLD-ecb2305a04588a24c738b37121d0d915a6a37b04.tar.gz
opensim-SC_OLD-ecb2305a04588a24c738b37121d0d915a6a37b04.tar.bz2
opensim-SC_OLD-ecb2305a04588a24c738b37121d0d915a6a37b04.tar.xz
temporary fix for sitting collisions in ODE
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs13
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs5
2 files changed, 2 insertions, 16 deletions
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
835 OutPacket(avatarReply); 835 OutPacket(avatarReply);
836 } 836 }
837 837
838 public void SendSitResponse(LLUUID targetID, LLVector3 offset)
839 {
840 AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket();
841
842 avatarSitResponse.SitObject.ID = targetID;
843
844 avatarSitResponse.SitTransform.AutoPilot = true;
845 avatarSitResponse.SitTransform.SitPosition = offset;
846 avatarSitResponse.SitTransform.SitRotation = new LLQuaternion(0.0f, 0.0f, 0.0f, 1.0f);
847
848 OutPacket(avatarSitResponse);
849 }
850
851 #endregion 838 #endregion
852 839
853 #region Appearance/ Wearables Methods 840 #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
200 } 200 }
201 break; 201 break;
202 case PacketType.AgentRequestSit: 202 case PacketType.AgentRequestSit:
203 AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket) Pack;
204 SendSitResponse(agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
205 if (OnAgentRequestSit != null) 203 if (OnAgentRequestSit != null)
206 { 204 {
205 AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket)Pack;
207 OnAgentRequestSit(this, agentRequestSit.AgentData.AgentID, 206 OnAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
208 agentRequestSit.TargetObject.TargetID); 207 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
209 } 208 }
210 break; 209 break;
211 case PacketType.AgentSit: 210 case PacketType.AgentSit: