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

mantis 8547: allow volume detectors to tell detector prim link number. Note that this is not as spec, also that the name llDetectedLinkNumber should actually be llDetectorLinkNumber since it refers to the detector not detected object

master
UbitUmarov 2020-02-03 13:25:00 +00:00
parent 662c41ddee
commit 3196d2fa6f
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -30,8 +30,6 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Runtime.Serialization;
using System.Security.Permissions;
using System.Threading; using System.Threading;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
@ -39,10 +37,8 @@ using System.Xml.Serialization;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
using OpenMetaverse.StructuredData;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes.Scripting;
using OpenSim.Region.Framework.Scenes.Serialization; using OpenSim.Region.Framework.Scenes.Serialization;
using OpenSim.Region.PhysicsModules.SharedBase; using OpenSim.Region.PhysicsModules.SharedBase;
using PermissionMask = OpenSim.Framework.PermissionMask; using PermissionMask = OpenSim.Framework.PermissionMask;
@ -2663,9 +2659,10 @@ namespace OpenSim.Region.Framework.Scenes
detobj.velVector = obj.Velocity; detobj.velVector = obj.Velocity;
detobj.colliderType = 0; detobj.colliderType = 0;
detobj.groupUUID = obj.GroupID; detobj.groupUUID = obj.GroupID;
if (VolumeDetectActive) // allow detector link number to be seen, unlike spec
detobj.linkNumber = 0; //if (VolumeDetectActive)
else // detobj.linkNumber = 0;
//else
detobj.linkNumber = LinkNum; detobj.linkNumber = LinkNum;
return detobj; return detobj;
} }
@ -2685,9 +2682,9 @@ namespace OpenSim.Region.Framework.Scenes
else if(detobj.velVector != Vector3.Zero) else if(detobj.velVector != Vector3.Zero)
detobj.colliderType |= 0x2; //active detobj.colliderType |= 0x2; //active
detobj.groupUUID = av.ControllingClient.ActiveGroupId; detobj.groupUUID = av.ControllingClient.ActiveGroupId;
if (VolumeDetectActive) //if (VolumeDetectActive)
detobj.linkNumber = 0; // detobj.linkNumber = 0;
else //else
detobj.linkNumber = LinkNum; detobj.linkNumber = LinkNum;
return detobj; return detobj;