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);
}
catch (Exception e)
catch
{
m_log.ErrorFormat("[{0}] Error loading: \"{1}\".", Name, file);
}
if (componentAssembly != null)
{
try

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

@ -871,7 +871,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
Stop(100);
Running = run;
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
{
private RegionInfoStructure CurrentRegion;
//private 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();
parameters.IncludeDebugInformation = true;
string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
//string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
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);
// The default constructor
ConstructorBuilder ctorBuilder = classBuilder.DefineDefaultConstructor(MethodAttributes.Public);
//ConstructorBuilder ctorBuilder = classBuilder.DefineDefaultConstructor(MethodAttributes.Public);
Type[] paramsTypeArray = new Type[] {typeof (System.ParamArrayAttribute)};
@ -81,9 +81,9 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
//ilgen.Emit(OpCodes.Ldelem_Ref);
//ilgen.MarkSequencePoint(doc, 6, 1, 6, 100);
MethodInfo ExecuteFunction = typeof(ScriptAssemblies.IScript).GetMethod(
"ExecuteFunction",
executeFunctionTypeArray);
//MethodInfo ExecuteFunction = typeof(ScriptAssemblies.IScript).GetMethod(
// "ExecuteFunction",
// executeFunctionTypeArray);
ilgen.DeclareLocal(typeof(string));
ilgen.Emit(OpCodes.Nop);
@ -234,7 +234,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
File.Delete(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;
}
UUID assetID = UUID.Zero;
//UUID assetID = UUID.Zero;
TaskInventoryItem taskInventoryItem = new TaskInventoryItem();
if (m_host.TaskInventory.TryGetValue(ScriptObject.Script.ItemID, out taskInventoryItem))
assetID = taskInventoryItem.AssetID;
//if (m_host.TaskInventory.TryGetValue(ScriptObject.Script.ItemID, out taskInventoryItem))
// assetID = taskInventoryItem.AssetID;
ScenePresence presence =
ScriptObject.Script.RegionInfo.Scene.GetScenePresence(taskInventoryItem.OwnerID);
@ -168,7 +168,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
{
IScriptCompiler compiler =
ScriptObject.Script.RegionInfo.FindCompiler(ScriptObject.Script.ScriptMetaData);
RegionInfoStructure currentRegionInfo = ScriptObject.Script.RegionInfo;
//RegionInfoStructure currentRegionInfo = ScriptObject.Script.RegionInfo;
fileName = compiler.Compile(ScriptObject.Script.ScriptMetaData,
ref ScriptObject.Script.Source);
ScriptObject.Script.AssemblyFileName = fileName;
@ -263,7 +263,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
// Tell script not to accept new requests
ss.Running = false;
ss.Disabled = true;
AppDomain ad = ss.AppDomain;
//AppDomain ad = ss.AppDomain;
// Remove from internal structure
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 event ExecuteFunctionEventDelegate OnExecuteFunction;
private List<ICommandProvider> CommandProviders = new List<ICommandProvider>();
//private List<ICommandProvider> CommandProviders = new List<ICommandProvider>();
public ScriptBase()
{