diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index ddbd677..6428b86 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -6600,19 +6600,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6600 | #endregion | 6600 | #endregion |
6601 | 6601 | ||
6602 | AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit; | 6602 | AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit; |
6603 | if (handlerAgentRequestSit != null) | ||
6604 | if (!(agentRequestSit.AgentData == null | ||
6605 | || agentRequestSit.TargetObject == null | ||
6606 | || agentRequestSit.TargetObject.TargetID == null | ||
6607 | || agentRequestSit.TargetObject.Offset == null)) | ||
6608 | { | ||
6609 | var sp = m_scene.GetScenePresence(agentRequestSit.AgentData.AgentID); | ||
6610 | if (sp == null || sp.ParentID != 0) // ignore packet if agent is already sitting | ||
6611 | return true; | ||
6612 | 6603 | ||
6613 | handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID, | 6604 | if (handlerAgentRequestSit != null) |
6614 | agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); | 6605 | handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID, |
6615 | } | 6606 | agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); |
6616 | } | 6607 | } |
6617 | return true; | 6608 | return true; |
6618 | } | 6609 | } |