diff options
author | UbitUmarov | 2019-02-21 23:17:53 +0000 |
---|---|---|
committer | UbitUmarov | 2019-02-21 23:17:53 +0000 |
commit | 5d78f52f7bd3aa27385a800ecae35d3579d3bee8 (patch) | |
tree | b1cb8ea65c5771155ce0c6684a36ee27a3311dc3 /OpenSim | |
parent | add LSL_String osGetInventoryName(LSL_Key itemId) and LSL_String osGetInvento... (diff) | |
download | opensim-SC-5d78f52f7bd3aa27385a800ecae35d3579d3bee8.zip opensim-SC-5d78f52f7bd3aa27385a800ecae35d3579d3bee8.tar.gz opensim-SC-5d78f52f7bd3aa27385a800ecae35d3579d3bee8.tar.bz2 opensim-SC-5d78f52f7bd3aa27385a800ecae35d3579d3bee8.tar.xz |
let Xengine also have that detectedkey
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 17 | ||||
-rw-r--r-- | OpenSim/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 7c2136e..50a95a9 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -218,9 +218,22 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
218 | public void changed(uint localID, uint change, object parameter) | 218 | public void changed(uint localID, uint change, object parameter) |
219 | { | 219 | { |
220 | // Add to queue for all scripts in localID, Object pass change. | 220 | // Add to queue for all scripts in localID, Object pass change. |
221 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 221 | if(parameter == null) |
222 | "changed",new object[] { new LSL_Types.LSLInteger(change) }, | 222 | { |
223 | myScriptEngine.PostObjectEvent(localID, new EventParams( | ||
224 | "changed", new object[] { new LSL_Types.LSLInteger(change) }, | ||
223 | new DetectParams[0])); | 225 | new DetectParams[0])); |
226 | return; | ||
227 | } | ||
228 | if (parameter is UUID) | ||
229 | { | ||
230 | DetectParams det = new DetectParams(); | ||
231 | det.Key = (UUID)parameter; | ||
232 | myScriptEngine.PostObjectEvent(localID, new EventParams( | ||
233 | "changed", new object[] { new LSL_Types.LSLInteger(change) }, | ||
234 | new DetectParams[] { det })); | ||
235 | return; | ||
236 | } | ||
224 | } | 237 | } |
225 | 238 | ||
226 | // state_entry: not processed here | 239 | // state_entry: not processed here |
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs b/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs index eb5aeeb..65a8aed 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs | |||
@@ -182,21 +182,21 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
182 | new DetectParams[] { det })); | 182 | new DetectParams[] { det })); |
183 | } | 183 | } |
184 | 184 | ||
185 | public void changed(uint localID, uint change, object data) | 185 | public void changed(uint localID, uint change, object parameter) |
186 | { | 186 | { |
187 | int ch = (int)change; | 187 | int ch = (int)change; |
188 | // Add to queue for all scripts in localID, Object pass change. | 188 | // Add to queue for all scripts in localID, Object pass change. |
189 | if(data == null) | 189 | if(parameter == null) |
190 | { | 190 | { |
191 | PostObjectEvent(localID, new EventParams( | 191 | PostObjectEvent(localID, new EventParams( |
192 | "changed", new object[] { ch }, | 192 | "changed", new object[] { ch }, |
193 | zeroDetectParams)); | 193 | zeroDetectParams)); |
194 | return; | 194 | return; |
195 | } | 195 | } |
196 | if ( data is UUID) | 196 | if ( parameter is UUID) |
197 | { | 197 | { |
198 | DetectParams det = new DetectParams(); | 198 | DetectParams det = new DetectParams(); |
199 | det.Key = (UUID)data; | 199 | det.Key = (UUID)parameter; |
200 | PostObjectEvent(localID, new EventParams( | 200 | PostObjectEvent(localID, new EventParams( |
201 | "changed", new object[] { ch }, | 201 | "changed", new object[] { ch }, |
202 | new DetectParams[] { det })); | 202 | new DetectParams[] { det })); |