diff options
author | Justin Clark-Casey (justincc) | 2014-10-04 00:14:28 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-10-04 00:16:47 +0100 |
commit | cbd428cff3c1fdaf246cb08d068688a7bc5d03e3 (patch) | |
tree | f04240508e5cdcc5ce90f25ddaf37075ccc8fd58 /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | minor: Comment out received seed caps request logging for now (diff) | |
download | opensim-SC-cbd428cff3c1fdaf246cb08d068688a7bc5d03e3.zip opensim-SC-cbd428cff3c1fdaf246cb08d068688a7bc5d03e3.tar.gz opensim-SC-cbd428cff3c1fdaf246cb08d068688a7bc5d03e3.tar.bz2 opensim-SC-cbd428cff3c1fdaf246cb08d068688a7bc5d03e3.tar.xz |
Add LSL transaction_result event.
This is cinderblocks' transaction_result.diff from http://opensimulator.org/mantis/view.php?id=7329 but I have used lsl.parser.cs and lsl.lexer.cs files generated directly from opensim-libs rather than those supplied in the patch.
I also added scriptEvents.transaction_reuslt.
The required parser/lexer generation file changes were made in commit d564f28 in the opensim-libs repo.
Thanks!
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index 9615315..ce17ed0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | |||
@@ -77,6 +77,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
77 | touch = 8, | 77 | touch = 8, |
78 | touch_end = 536870912, | 78 | touch_end = 536870912, |
79 | touch_start = 2097152, | 79 | touch_start = 2097152, |
80 | transaction_result = 33554432, | ||
80 | object_rez = 4194304 | 81 | object_rez = 4194304 |
81 | } | 82 | } |
82 | 83 | ||
@@ -235,6 +236,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
235 | m_eventFlagsMap.Add("touch", scriptEvents.touch); | 236 | m_eventFlagsMap.Add("touch", scriptEvents.touch); |
236 | m_eventFlagsMap.Add("touch_end", scriptEvents.touch_end); | 237 | m_eventFlagsMap.Add("touch_end", scriptEvents.touch_end); |
237 | m_eventFlagsMap.Add("touch_start", scriptEvents.touch_start); | 238 | m_eventFlagsMap.Add("touch_start", scriptEvents.touch_start); |
239 | m_eventFlagsMap.Add("transaction_result", scriptEvents.transaction_result); | ||
238 | m_eventFlagsMap.Add("object_rez", scriptEvents.object_rez); | 240 | m_eventFlagsMap.Add("object_rez", scriptEvents.object_rez); |
239 | } | 241 | } |
240 | } | 242 | } |