aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorMelanie2013-01-13 13:44:24 +0000
committerMelanie2013-01-13 13:44:24 +0000
commit923e5df7aedd1f81b481363db00866590bed0f15 (patch)
tree47aaa12f40c126f7c81dec6637c4c11647403117 /OpenSim/Region/ClientStack/Linden/UDP
parentMerge branch 'master' into careminster (diff)
parentBulletSim: fix the 'No recognised physics mesh found ...' error spew by remem... (diff)
downloadopensim-SC-923e5df7aedd1f81b481363db00866590bed0f15.zip
opensim-SC-923e5df7aedd1f81b481363db00866590bed0f15.tar.gz
opensim-SC-923e5df7aedd1f81b481363db00866590bed0f15.tar.bz2
opensim-SC-923e5df7aedd1f81b481363db00866590bed0f15.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs14
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 465d76d..ddbd677 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
6601 6601
6602 AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit; 6602 AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit;
6603 if (handlerAgentRequestSit != null) 6603 if (handlerAgentRequestSit != null)
6604 handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID, 6604 if (!(agentRequestSit.AgentData == null
6605 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); 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
6613 handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
6614 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
6615 }
6606 } 6616 }
6607 return true; 6617 return true;
6608 } 6618 }