From 5d78f52f7bd3aa27385a800ecae35d3579d3bee8 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 21 Feb 2019 23:17:53 +0000 Subject: [PATCH] let Xengine also have that detectedkey --- .../Region/ScriptEngine/XEngine/EventManager.cs | 17 +++++++++++++++-- .../Region/ScriptEngine/YEngine/XMREvents.cs | 8 ++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 7c2136edd6..50a95a90ee 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs @@ -218,9 +218,22 @@ namespace OpenSim.Region.ScriptEngine.XEngine public void changed(uint localID, uint change, object parameter) { // Add to queue for all scripts in localID, Object pass change. - myScriptEngine.PostObjectEvent(localID, new EventParams( - "changed",new object[] { new LSL_Types.LSLInteger(change) }, + if(parameter == null) + { + myScriptEngine.PostObjectEvent(localID, new EventParams( + "changed", new object[] { new LSL_Types.LSLInteger(change) }, new DetectParams[0])); + return; + } + if (parameter is UUID) + { + DetectParams det = new DetectParams(); + det.Key = (UUID)parameter; + myScriptEngine.PostObjectEvent(localID, new EventParams( + "changed", new object[] { new LSL_Types.LSLInteger(change) }, + new DetectParams[] { det })); + return; + } } // state_entry: not processed here diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs b/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs index eb5aeeb86d..65a8aed88b 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs @@ -182,21 +182,21 @@ namespace OpenSim.Region.ScriptEngine.Yengine new DetectParams[] { det })); } - public void changed(uint localID, uint change, object data) + public void changed(uint localID, uint change, object parameter) { int ch = (int)change; // Add to queue for all scripts in localID, Object pass change. - if(data == null) + if(parameter == null) { PostObjectEvent(localID, new EventParams( "changed", new object[] { ch }, zeroDetectParams)); return; } - if ( data is UUID) + if ( parameter is UUID) { DetectParams det = new DetectParams(); - det.Key = (UUID)data; + det.Key = (UUID)parameter; PostObjectEvent(localID, new EventParams( "changed", new object[] { ch }, new DetectParams[] { det }));