OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move resit fix to ScenePresence.cs and allow for requesting sit on objects other than the object currently sat on

0.7.5-pf-bulletsim
dahlia 2013-01-14 22:24:24 -08:00 committed by Justin Clark-Casey (justincc)
parent 795009cae2
commit e2823bfefe
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -6427,19 +6427,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#endregion #endregion
AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit; AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit;
if (handlerAgentRequestSit != null)
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, if (handlerAgentRequestSit != null)
agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
} agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
} }
return true; return true;
} }

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1954,6 +1954,10 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (ParentID != 0) if (ParentID != 0)
{ {
var targetPart = m_scene.GetSceneObjectPart(targetID);
if (targetPart != null && targetPart.LocalId == ParentID)
return; // already sitting here, ignore
StandUp(); StandUp();
} }