diff options
author | Justin Clark-Casey (justincc) | 2013-01-15 21:13:22 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-15 21:13:22 +0000 |
commit | fccb03227e3f541a4c2f4e0e619074e4c1fb55dd (patch) | |
tree | aa37ee5014fe71bb07d1d4e296a7ac3821c84da4 /OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | |
parent | Print full stacktrace from plugin loading failure to help determine what went... (diff) | |
download | opensim-SC-fccb03227e3f541a4c2f4e0e619074e4c1fb55dd.zip opensim-SC-fccb03227e3f541a4c2f4e0e619074e4c1fb55dd.tar.gz opensim-SC-fccb03227e3f541a4c2f4e0e619074e4c1fb55dd.tar.bz2 opensim-SC-fccb03227e3f541a4c2f4e0e619074e4c1fb55dd.tar.xz |
Instead of passing separate engine, part and item components to script APIs, pass down IScriptInstance instead.
This is to allow the future co-operative script thread terminate feature to detect and act upon termination requests.
This splits the assembly and state loading out from the ScriptInstance() constructor to a separate Load() method
in order to facilititate continued script logic regression testing.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs index 2027ca6..e95cbd7 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | |||
@@ -29,6 +29,7 @@ using System; | |||
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Framework.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
32 | using OpenSim.Region.ScriptEngine.Shared; | ||
32 | 33 | ||
33 | namespace OpenSim.Region.ScriptEngine.Interfaces | 34 | namespace OpenSim.Region.ScriptEngine.Interfaces |
34 | { | 35 | { |
@@ -38,11 +39,8 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
38 | /// Initialize the API | 39 | /// Initialize the API |
39 | /// </summary> | 40 | /// </summary> |
40 | /// <remarks> | 41 | /// <remarks> |
41 | /// Each API has an identifier, which is used to load the | 42 | /// Each API has an identifier, which is used to load the proper runtime assembly at load time. |
42 | /// proper runtime assembly at load time. | 43 | /// <param name='scriptInstance'>/param> |
43 | /// <param name='engine'>/param> | 44 | void Initialize(IScriptInstance scriptInstance); |
44 | /// <param name='part'></param> | ||
45 | /// <param name='item'></param> | ||
46 | void Initialize(IScriptEngine engine, SceneObjectPart part, TaskInventoryItem item); | ||
47 | } | 45 | } |
48 | } \ No newline at end of file | 46 | } \ No newline at end of file |