From 4ec4e16c809cf86a63b736d2b7b6ad7291595a5f Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 4 Jun 2008 09:59:27 +0000 Subject: Formatting cleanup, minor refactoring, svn properties. --- .../Region/ScriptEngine/XEngine/Script/AssemblyResolver.cs | 14 +++++++------- .../XEngine/Script/BuiltIn_Commands_BaseClass.cs | 2 +- OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/XEngine/Script') diff --git a/OpenSim/Region/ScriptEngine/XEngine/Script/AssemblyResolver.cs b/OpenSim/Region/ScriptEngine/XEngine/Script/AssemblyResolver.cs index 8107788..cf15b67 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/Script/AssemblyResolver.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/Script/AssemblyResolver.cs @@ -37,25 +37,25 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script public static Assembly OnAssemblyResolve(object sender, ResolveEventArgs args) { - if(!(sender is System.AppDomain)) + if (!(sender is System.AppDomain)) return null; AppDomain myDomain = (AppDomain)sender; string dirName = myDomain.FriendlyName; - string[] pathList=new string[] {"bin", "ScriptEngines", - Path.Combine("ScriptEngines", dirName)}; + string[] pathList = new string[] {"bin", "ScriptEngines", + Path.Combine("ScriptEngines", dirName)}; string assemblyName = args.Name; - if(assemblyName.IndexOf(",") != -1) - assemblyName=args.Name.Substring(0, args.Name.IndexOf(",")); + if (assemblyName.IndexOf(",") != -1) + assemblyName = args.Name.Substring(0, args.Name.IndexOf(",")); foreach (string s in pathList) { - string path=Path.Combine(Directory.GetCurrentDirectory(), + string path = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine(s, assemblyName))+".dll"; - if(File.Exists(path)) + if (File.Exists(path)) return Assembly.LoadFrom(path); } diff --git a/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs index bae8192..ebe4fc5 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs @@ -106,7 +106,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script { foreach (KeyValuePair var in vars) { - if(m_Fields.ContainsKey(var.Key)) + if (m_Fields.ContainsKey(var.Key)) { m_Fields[var.Key].SetValue(this, var.Value); } diff --git a/OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs b/OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs index 2d5d2b8..a3dcfaf 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs @@ -1212,8 +1212,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script public LSLInteger(Object o) { - if(!(o is Int32)) - value=0; + if (!(o is Int32)) + value = 0; else value = (int)o; } @@ -1327,11 +1327,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script public override bool Equals(object o) { - if(o is Int32) + if (o is Int32) { return value == (Int32)o; } - if(o is LSLInteger) + if (o is LSLInteger) { return value == ((LSLInteger)o).value; } -- cgit v1.1