From 2eb0d8b6176c223e915a2d22b1c9540156283943 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 10 Jan 2013 20:21:18 -0800
Subject: add some sanity checking to HandleAgentRequestSit handler

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index d46adb8..0a865ab 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6601,8 +6601,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit;
                 if (handlerAgentRequestSit != null)
-                    handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
-                                           agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
+                    if (!(agentRequestSit.AgentData == null
+                        || agentRequestSit.TargetObject == null
+                        || agentRequestSit.TargetObject.TargetID == null
+                        || agentRequestSit.TargetObject.Offset == null))
+                    {
+                        var sp = m_scene.GetScenePresence(agentRequestSit.AgentData.AgentID);
+                        if (sp == null || sp.ParentID != 0) // ignore packet if agent is already sitting
+                            return true;
+
+                        handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
+                                               agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
+                    }
             }
             return true;
         }
-- 
cgit v1.1