aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-15 21:13:22 +0000
committerJustin Clark-Casey (justincc)2013-01-15 21:13:22 +0000
commitfccb03227e3f541a4c2f4e0e619074e4c1fb55dd (patch)
treeaa37ee5014fe71bb07d1d4e296a7ac3821c84da4 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
parentPrint full stacktrace from plugin loading failure to help determine what went... (diff)
downloadopensim-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/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 958a448..33ae5f0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -142,11 +142,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
142 142
143 protected IUrlModule m_UrlModule = null; 143 protected IUrlModule m_UrlModule = null;
144 144
145 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item) 145 public void Initialize(IScriptInstance scriptInstance)
146 { 146 {
147 m_ScriptEngine = ScriptEngine; 147 m_ScriptEngine = scriptInstance.Engine;
148 m_host = host; 148 m_host = scriptInstance.Part;
149 m_item = item; 149 m_item = scriptInstance.ScriptTask;
150 150
151 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>(); 151 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
152 152