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/IScriptInstance.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 'OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs index 2f5b526..9de2d72 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | |||
@@ -31,6 +31,7 @@ using System.Collections.Generic; | |||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using log4net; | 32 | using log4net; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Framework.Scenes; | ||
34 | using OpenSim.Region.ScriptEngine.Shared; | 35 | using OpenSim.Region.ScriptEngine.Shared; |
35 | using OpenSim.Region.ScriptEngine.Interfaces; | 36 | using OpenSim.Region.ScriptEngine.Interfaces; |
36 | 37 | ||
@@ -105,6 +106,11 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
105 | /// </summary> | 106 | /// </summary> |
106 | long MeasurementPeriodExecutionTime { get; } | 107 | long MeasurementPeriodExecutionTime { get; } |
107 | 108 | ||
109 | /// <summary> | ||
110 | /// Scene part in which this script instance is contained. | ||
111 | /// </summary> | ||
112 | SceneObjectPart Part { get; } | ||
113 | |||
108 | IScriptEngine Engine { get; } | 114 | IScriptEngine Engine { get; } |
109 | UUID AppDomain { get; set; } | 115 | UUID AppDomain { get; set; } |
110 | string PrimName { get; } | 116 | string PrimName { get; } |
@@ -124,6 +130,12 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
124 | 130 | ||
125 | uint LocalID { get; } | 131 | uint LocalID { get; } |
126 | UUID AssetID { get; } | 132 | UUID AssetID { get; } |
133 | |||
134 | /// <summary> | ||
135 | /// Inventory item containing the script used. | ||
136 | /// </summary> | ||
137 | TaskInventoryItem ScriptTask { get; } | ||
138 | |||
127 | Queue EventQueue { get; } | 139 | Queue EventQueue { get; } |
128 | 140 | ||
129 | /// <summary> | 141 | /// <summary> |