diff options
Diffstat (limited to 'OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs')
-rw-r--r-- | OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs index 1fd5d72..e657f32 100644 --- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs +++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs | |||
@@ -142,10 +142,10 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler | |||
142 | return; | 142 | return; |
143 | } | 143 | } |
144 | 144 | ||
145 | UUID assetID = UUID.Zero; | 145 | //UUID assetID = UUID.Zero; |
146 | TaskInventoryItem taskInventoryItem = new TaskInventoryItem(); | 146 | TaskInventoryItem taskInventoryItem = new TaskInventoryItem(); |
147 | if (m_host.TaskInventory.TryGetValue(ScriptObject.Script.ItemID, out taskInventoryItem)) | 147 | //if (m_host.TaskInventory.TryGetValue(ScriptObject.Script.ItemID, out taskInventoryItem)) |
148 | assetID = taskInventoryItem.AssetID; | 148 | // assetID = taskInventoryItem.AssetID; |
149 | 149 | ||
150 | ScenePresence presence = | 150 | ScenePresence presence = |
151 | ScriptObject.Script.RegionInfo.Scene.GetScenePresence(taskInventoryItem.OwnerID); | 151 | ScriptObject.Script.RegionInfo.Scene.GetScenePresence(taskInventoryItem.OwnerID); |
@@ -168,7 +168,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler | |||
168 | { | 168 | { |
169 | IScriptCompiler compiler = | 169 | IScriptCompiler compiler = |
170 | ScriptObject.Script.RegionInfo.FindCompiler(ScriptObject.Script.ScriptMetaData); | 170 | ScriptObject.Script.RegionInfo.FindCompiler(ScriptObject.Script.ScriptMetaData); |
171 | RegionInfoStructure currentRegionInfo = ScriptObject.Script.RegionInfo; | 171 | //RegionInfoStructure currentRegionInfo = ScriptObject.Script.RegionInfo; |
172 | fileName = compiler.Compile(ScriptObject.Script.ScriptMetaData, | 172 | fileName = compiler.Compile(ScriptObject.Script.ScriptMetaData, |
173 | ref ScriptObject.Script.Source); | 173 | ref ScriptObject.Script.Source); |
174 | ScriptObject.Script.AssemblyFileName = fileName; | 174 | ScriptObject.Script.AssemblyFileName = fileName; |
@@ -263,7 +263,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler | |||
263 | // Tell script not to accept new requests | 263 | // Tell script not to accept new requests |
264 | ss.Running = false; | 264 | ss.Running = false; |
265 | ss.Disabled = true; | 265 | ss.Disabled = true; |
266 | AppDomain ad = ss.AppDomain; | 266 | //AppDomain ad = ss.AppDomain; |
267 | 267 | ||
268 | // Remove from internal structure | 268 | // Remove from internal structure |
269 | MemRemoveScript(localID, itemID); | 269 | MemRemoveScript(localID, itemID); |