diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/EventManager.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 301eada..55a77bc 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
| @@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | /// <summary> | 81 | /// <summary> |
| 82 | /// When an object gets paid by an avatar and generates the paid event, | 82 | /// When an object gets paid by an avatar and generates the paid event, |
| 83 | /// this will pipe it to the script engine | 83 | /// this will pipe it to the script engine |
| 84 | /// </summary> | 84 | /// </summary> |
| 85 | /// <param name="objectID">Object ID that got paid</param> | 85 | /// <param name="objectID">Object ID that got paid</param> |
| @@ -413,7 +413,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 413 | return; | 413 | return; |
| 414 | 414 | ||
| 415 | foreach(SceneObjectPart part in grp.Parts) | 415 | foreach(SceneObjectPart part in grp.Parts) |
| 416 | { | 416 | { |
| 417 | myScriptEngine.PostObjectEvent(part.LocalId, new EventParams( | 417 | myScriptEngine.PostObjectEvent(part.LocalId, new EventParams( |
| 418 | "attach",new object[] { | 418 | "attach",new object[] { |
| 419 | new LSL_Types.LSLString(avatar.ToString()) }, | 419 | new LSL_Types.LSLString(avatar.ToString()) }, |