aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ScriptEngine/Components/DotNetEngine
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/ScriptEngine/Components/DotNetEngine/Commands_OSSL/Commands_OSSL.cs4
-rw-r--r--OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs2
-rw-r--r--OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs10
-rw-r--r--OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs10
4 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Commands_OSSL/Commands_OSSL.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Commands_OSSL/Commands_OSSL.cs
index 6b5dc14..86eab09 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Commands_OSSL/Commands_OSSL.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Commands_OSSL/Commands_OSSL.cs
@@ -34,10 +34,10 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Commands_OSSL
34{ 34{
35 public class Commands_OSSL : IScriptEngineComponent 35 public class Commands_OSSL : IScriptEngineComponent
36 { 36 {
37 private RegionInfoStructure CurrentRegion; 37 //private RegionInfoStructure CurrentRegion;
38 public void Initialize(RegionInfoStructure currentRegion) 38 public void Initialize(RegionInfoStructure currentRegion)
39 { 39 {
40 CurrentRegion = currentRegion; 40 //CurrentRegion = currentRegion;
41 } 41 }
42 42
43 } 43 }
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs
index 4b0e679..bff1879 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs
@@ -109,7 +109,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Compilers
109 109
110 CompilerParameters parameters = new CompilerParameters(); 110 CompilerParameters parameters = new CompilerParameters();
111 parameters.IncludeDebugInformation = true; 111 parameters.IncludeDebugInformation = true;
112 string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory); 112 //string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
113 113
114 foreach (string file in AppDomainAssemblies) 114 foreach (string file in AppDomainAssemblies)
115 { 115 {
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
index 2f6d916..93f29d7 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
@@ -60,7 +60,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
60 TypeBuilder classBuilder = modBuilder.DefineType(ClassID, TypeAttributes.Class | TypeAttributes.Public); 60 TypeBuilder classBuilder = modBuilder.DefineType(ClassID, TypeAttributes.Class | TypeAttributes.Public);
61 61
62 // The default constructor 62 // The default constructor
63 ConstructorBuilder ctorBuilder = classBuilder.DefineDefaultConstructor(MethodAttributes.Public); 63 //ConstructorBuilder ctorBuilder = classBuilder.DefineDefaultConstructor(MethodAttributes.Public);
64 64
65 65
66 Type[] paramsTypeArray = new Type[] {typeof (System.ParamArrayAttribute)}; 66 Type[] paramsTypeArray = new Type[] {typeof (System.ParamArrayAttribute)};
@@ -81,9 +81,9 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
81 //ilgen.Emit(OpCodes.Ldelem_Ref); 81 //ilgen.Emit(OpCodes.Ldelem_Ref);
82 //ilgen.MarkSequencePoint(doc, 6, 1, 6, 100); 82 //ilgen.MarkSequencePoint(doc, 6, 1, 6, 100);
83 83
84 MethodInfo ExecuteFunction = typeof(ScriptAssemblies.IScript).GetMethod( 84 //MethodInfo ExecuteFunction = typeof(ScriptAssemblies.IScript).GetMethod(
85 "ExecuteFunction", 85 // "ExecuteFunction",
86 executeFunctionTypeArray); 86 // executeFunctionTypeArray);
87 87
88 ilgen.DeclareLocal(typeof(string)); 88 ilgen.DeclareLocal(typeof(string));
89 ilgen.Emit(OpCodes.Nop); 89 ilgen.Emit(OpCodes.Nop);
@@ -234,7 +234,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
234 File.Delete(toFile); 234 File.Delete(toFile);
235 File.Move(asmFileName, toFile); 235 File.Move(asmFileName, toFile);
236 236
237 string a = ""; 237 //string a = "";
238 } 238 }
239 } 239 }
240} \ No newline at end of file 240} \ No newline at end of file
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);