diff options
author | root | 2019-03-11 23:41:26 +0000 |
---|---|---|
committer | root | 2019-03-11 23:41:26 +0000 |
commit | c7a02dc058018429fca8fb0c979785be34bebaf6 (patch) | |
tree | a364249657222c201c9880ec355dafbcb7f99d9a /OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs | |
parent | Should have been in the last commit (diff) | |
parent | errr use invariantculture compare not current (diff) | |
download | opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.zip opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.tar.gz opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.tar.bz2 opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.tar.xz |
Merge branch 'master' of brain.opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs b/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs index 5a8b2a3..65a8aed 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs | |||
@@ -182,13 +182,26 @@ 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) | 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 | this.PostObjectEvent(localID, new EventParams( | 189 | if(parameter == null) |
190 | { | ||
191 | PostObjectEvent(localID, new EventParams( | ||
190 | "changed", new object[] { ch }, | 192 | "changed", new object[] { ch }, |
191 | zeroDetectParams)); | 193 | zeroDetectParams)); |
194 | return; | ||
195 | } | ||
196 | if ( parameter is UUID) | ||
197 | { | ||
198 | DetectParams det = new DetectParams(); | ||
199 | det.Key = (UUID)parameter; | ||
200 | PostObjectEvent(localID, new EventParams( | ||
201 | "changed", new object[] { ch }, | ||
202 | new DetectParams[] { det })); | ||
203 | return; | ||
204 | } | ||
192 | } | 205 | } |
193 | 206 | ||
194 | // state_entry: not processed here | 207 | // state_entry: not processed here |