diff options
author | Jeff Ames | 2008-06-04 09:59:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-06-04 09:59:27 +0000 |
commit | 4ec4e16c809cf86a63b736d2b7b6ad7291595a5f (patch) | |
tree | cfa896ef9057228171e2ee39c4807060101ba90b /OpenSim/Region/ScriptEngine/XEngine/Script | |
parent | * If a ThreadAbortException reaches AuthUser() then let it pass through unmol... (diff) | |
download | opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.zip opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.gz opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.bz2 opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.xz |
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to '')
3 files changed, 12 insertions, 12 deletions
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 | |||
37 | public static Assembly OnAssemblyResolve(object sender, | 37 | public static Assembly OnAssemblyResolve(object sender, |
38 | ResolveEventArgs args) | 38 | ResolveEventArgs args) |
39 | { | 39 | { |
40 | if(!(sender is System.AppDomain)) | 40 | if (!(sender is System.AppDomain)) |
41 | return null; | 41 | return null; |
42 | 42 | ||
43 | AppDomain myDomain = (AppDomain)sender; | 43 | AppDomain myDomain = (AppDomain)sender; |
44 | string dirName = myDomain.FriendlyName; | 44 | string dirName = myDomain.FriendlyName; |
45 | 45 | ||
46 | string[] pathList=new string[] {"bin", "ScriptEngines", | 46 | string[] pathList = new string[] {"bin", "ScriptEngines", |
47 | Path.Combine("ScriptEngines", dirName)}; | 47 | Path.Combine("ScriptEngines", dirName)}; |
48 | 48 | ||
49 | string assemblyName = args.Name; | 49 | string assemblyName = args.Name; |
50 | if(assemblyName.IndexOf(",") != -1) | 50 | if (assemblyName.IndexOf(",") != -1) |
51 | assemblyName=args.Name.Substring(0, args.Name.IndexOf(",")); | 51 | assemblyName = args.Name.Substring(0, args.Name.IndexOf(",")); |
52 | 52 | ||
53 | foreach (string s in pathList) | 53 | foreach (string s in pathList) |
54 | { | 54 | { |
55 | string path=Path.Combine(Directory.GetCurrentDirectory(), | 55 | string path = Path.Combine(Directory.GetCurrentDirectory(), |
56 | Path.Combine(s, assemblyName))+".dll"; | 56 | Path.Combine(s, assemblyName))+".dll"; |
57 | 57 | ||
58 | if(File.Exists(path)) | 58 | if (File.Exists(path)) |
59 | return Assembly.LoadFrom(path); | 59 | return Assembly.LoadFrom(path); |
60 | } | 60 | } |
61 | 61 | ||
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 | |||
106 | { | 106 | { |
107 | foreach (KeyValuePair<string, object> var in vars) | 107 | foreach (KeyValuePair<string, object> var in vars) |
108 | { | 108 | { |
109 | if(m_Fields.ContainsKey(var.Key)) | 109 | if (m_Fields.ContainsKey(var.Key)) |
110 | { | 110 | { |
111 | m_Fields[var.Key].SetValue(this, var.Value); | 111 | m_Fields[var.Key].SetValue(this, var.Value); |
112 | } | 112 | } |
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 | |||
1212 | 1212 | ||
1213 | public LSLInteger(Object o) | 1213 | public LSLInteger(Object o) |
1214 | { | 1214 | { |
1215 | if(!(o is Int32)) | 1215 | if (!(o is Int32)) |
1216 | value=0; | 1216 | value = 0; |
1217 | else | 1217 | else |
1218 | value = (int)o; | 1218 | value = (int)o; |
1219 | } | 1219 | } |
@@ -1327,11 +1327,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script | |||
1327 | 1327 | ||
1328 | public override bool Equals(object o) | 1328 | public override bool Equals(object o) |
1329 | { | 1329 | { |
1330 | if(o is Int32) | 1330 | if (o is Int32) |
1331 | { | 1331 | { |
1332 | return value == (Int32)o; | 1332 | return value == (Int32)o; |
1333 | } | 1333 | } |
1334 | if(o is LSLInteger) | 1334 | if (o is LSLInteger) |
1335 | { | 1335 | { |
1336 | return value == ((LSLInteger)o).value; | 1336 | return value == ((LSLInteger)o).value; |
1337 | } | 1337 | } |