diff options
| author | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
| commit | c846cefda97bd59b7707147d7ae1a520c9121127 (patch) | |
| tree | ee23e4b451087874a8149348e010a905817121f7 /OpenSim/Region/ClientStack | |
| parent | refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart i... (diff) | |
| parent | BulletSim: fix not moving physical objects below terrain to over terrain. (diff) | |
| download | opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.zip opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.gz opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.bz2 opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 14 |
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 504df40..a8517e6 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -6428,8 +6428,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 6428 | 6428 | ||
| 6429 | AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit; | 6429 | AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit; |
| 6430 | if (handlerAgentRequestSit != null) | 6430 | if (handlerAgentRequestSit != null) |
| 6431 | handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID, | 6431 | if (!(agentRequestSit.AgentData == null |
| 6432 | agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); | 6432 | || agentRequestSit.TargetObject == null |
| 6433 | || agentRequestSit.TargetObject.TargetID == null | ||
| 6434 | || agentRequestSit.TargetObject.Offset == null)) | ||
| 6435 | { | ||
| 6436 | var sp = m_scene.GetScenePresence(agentRequestSit.AgentData.AgentID); | ||
| 6437 | if (sp == null || sp.ParentID != 0) // ignore packet if agent is already sitting | ||
| 6438 | return true; | ||
| 6439 | |||
| 6440 | handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID, | ||
| 6441 | agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); | ||
| 6442 | } | ||
| 6433 | } | 6443 | } |
| 6434 | return true; | 6444 | return true; |
| 6435 | } | 6445 | } |