bad merge?

1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 0ff2da3..ad775ff 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -245,6 +245,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 DetectParams d = new DetectParams();
                 d.Key =detobj.keyUUID;
                 d.Populate(myScriptEngine.World);
+                d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part
                 det.Add(d);
             }
 
@@ -265,6 +266,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 DetectParams d = new DetectParams();
                 d.Key =detobj.keyUUID;
                 d.Populate(myScriptEngine.World);
+                d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part
                 det.Add(d);
             }
 
@@ -284,6 +286,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 DetectParams d = new DetectParams();
                 d.Key =detobj.keyUUID;
                 d.Populate(myScriptEngine.World);
+                d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part
                 det.Add(d);
             }