OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: remove mono compiler warnings

0.6.1-post-fixes
Justin Clarke Casey 2008-11-10 19:06:01 +00:00
parent 5d1d5a22a9
commit 0f22013ae4
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/ApplicationPlugins/ScriptEngine/ComponentFactory.cs
View File

@ -65,10 +65,11 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
{ {
componentAssembly = Assembly.LoadFrom(file); componentAssembly = Assembly.LoadFrom(file);
} }
catch (Exception e) catch
{ {
m_log.ErrorFormat("[{0}] Error loading: \"{1}\".", Name, file); m_log.ErrorFormat("[{0}] Error loading: \"{1}\".", Name, file);
} }
if (componentAssembly != null) if (componentAssembly != null)
{ {
try try

1
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -871,7 +871,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
Stop(100); Stop(100);
Running = run; Running = run;
return ScriptSerializer.Serialize(this); return ScriptSerializer.Serialize(this);
Running = false;
} }
} }
} }

4
OpenSim/ScriptEngine/Components/DotNetEngine/Commands_OSSL/Commands_OSSL.cs
View File

@ -34,10 +34,10 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Commands_OSSL
{ {
public class Commands_OSSL : IScriptEngineComponent public class Commands_OSSL : IScriptEngineComponent
{ {
private RegionInfoStructure CurrentRegion; //private RegionInfoStructure CurrentRegion;
public void Initialize(RegionInfoStructure currentRegion) public void Initialize(RegionInfoStructure currentRegion)
{ {
CurrentRegion = currentRegion; //CurrentRegion = currentRegion;
} }
} }

2
OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs
View File

@ -109,7 +109,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Compilers
CompilerParameters parameters = new CompilerParameters(); CompilerParameters parameters = new CompilerParameters();
parameters.IncludeDebugInformation = true; parameters.IncludeDebugInformation = true;
string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory); //string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
foreach (string file in AppDomainAssemblies) foreach (string file in AppDomainAssemblies)
{ {

10
OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
View File

@ -60,7 +60,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
TypeBuilder classBuilder = modBuilder.DefineType(ClassID, TypeAttributes.Class | TypeAttributes.Public); TypeBuilder classBuilder = modBuilder.DefineType(ClassID, TypeAttributes.Class | TypeAttributes.Public);
// The default constructor // The default constructor
ConstructorBuilder ctorBuilder = classBuilder.DefineDefaultConstructor(MethodAttributes.Public); //ConstructorBuilder ctorBuilder = classBuilder.DefineDefaultConstructor(MethodAttributes.Public);
Type[] paramsTypeArray = new Type[] {typeof (System.ParamArrayAttribute)}; Type[] paramsTypeArray = new Type[] {typeof (System.ParamArrayAttribute)};
@ -81,9 +81,9 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
//ilgen.Emit(OpCodes.Ldelem_Ref); //ilgen.Emit(OpCodes.Ldelem_Ref);
//ilgen.MarkSequencePoint(doc, 6, 1, 6, 100); //ilgen.MarkSequencePoint(doc, 6, 1, 6, 100);
MethodInfo ExecuteFunction = typeof(ScriptAssemblies.IScript).GetMethod( //MethodInfo ExecuteFunction = typeof(ScriptAssemblies.IScript).GetMethod(
"ExecuteFunction", // "ExecuteFunction",
executeFunctionTypeArray); // executeFunctionTypeArray);
ilgen.DeclareLocal(typeof(string)); ilgen.DeclareLocal(typeof(string));
ilgen.Emit(OpCodes.Nop); ilgen.Emit(OpCodes.Nop);
@ -234,7 +234,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
File.Delete(toFile); File.Delete(toFile);
File.Move(asmFileName, toFile); File.Move(asmFileName, toFile);
string a = ""; //string a = "";
} }
} }
} }

10
OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs
View File

@ -142,10 +142,10 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
return; return;
} }
UUID assetID = UUID.Zero; //UUID assetID = UUID.Zero;
TaskInventoryItem taskInventoryItem = new TaskInventoryItem(); TaskInventoryItem taskInventoryItem = new TaskInventoryItem();
if (m_host.TaskInventory.TryGetValue(ScriptObject.Script.ItemID, out taskInventoryItem)) //if (m_host.TaskInventory.TryGetValue(ScriptObject.Script.ItemID, out taskInventoryItem))
assetID = taskInventoryItem.AssetID; // assetID = taskInventoryItem.AssetID;
ScenePresence presence = ScenePresence presence =
ScriptObject.Script.RegionInfo.Scene.GetScenePresence(taskInventoryItem.OwnerID); ScriptObject.Script.RegionInfo.Scene.GetScenePresence(taskInventoryItem.OwnerID);
@ -168,7 +168,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
{ {
IScriptCompiler compiler = IScriptCompiler compiler =
ScriptObject.Script.RegionInfo.FindCompiler(ScriptObject.Script.ScriptMetaData); ScriptObject.Script.RegionInfo.FindCompiler(ScriptObject.Script.ScriptMetaData);
RegionInfoStructure currentRegionInfo = ScriptObject.Script.RegionInfo; //RegionInfoStructure currentRegionInfo = ScriptObject.Script.RegionInfo;
fileName = compiler.Compile(ScriptObject.Script.ScriptMetaData, fileName = compiler.Compile(ScriptObject.Script.ScriptMetaData,
ref ScriptObject.Script.Source); ref ScriptObject.Script.Source);
ScriptObject.Script.AssemblyFileName = fileName; ScriptObject.Script.AssemblyFileName = fileName;
@ -263,7 +263,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
// Tell script not to accept new requests // Tell script not to accept new requests
ss.Running = false; ss.Running = false;
ss.Disabled = true; ss.Disabled = true;
AppDomain ad = ss.AppDomain; //AppDomain ad = ss.AppDomain;
// Remove from internal structure // Remove from internal structure
MemRemoveScript(localID, itemID); MemRemoveScript(localID, itemID);

2
OpenSim/ScriptEngine/Shared.Script/ScriptBase.cs
View File

@ -55,7 +55,7 @@ namespace ScriptAssemblies
public delegate void ExecuteFunctionEventDelegate(string functionName, params object[] args); public delegate void ExecuteFunctionEventDelegate(string functionName, params object[] args);
public event ExecuteFunctionEventDelegate OnExecuteFunction; public event ExecuteFunctionEventDelegate OnExecuteFunction;
private List<ICommandProvider> CommandProviders = new List<ICommandProvider>(); //private List<ICommandProvider> CommandProviders = new List<ICommandProvider>();
public ScriptBase() public ScriptBase()
{ {