From 3196d2fa6ffa31a4a7a9c4a5e28948474a700754 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Mon, 3 Feb 2020 13:25:00 +0000
Subject: [PATCH] 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

---
 .../Region/Framework/Scenes/SceneObjectPart.cs  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

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