ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-16 03:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting cleanup, minor refactoring, svn properties.

Browse Source
This commit is contained in:
Jeff Ames
2008-06-04 09:59:27 +00:00
parent 0a2d399cad
commit 4ec4e16c80
59 changed files with 851 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/ScriptEngine/XEngine/Script/AssemblyResolver.cs
View File

@@ -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);
}

2
OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs
View File

@@ -106,7 +106,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script
{
foreach (KeyValuePair<string, object> var in vars)
{
if(m_Fields.ContainsKey(var.Key))
if (m_Fields.ContainsKey(var.Key))
{
m_Fields[var.Key].SetValue(this, var.Value);
}

8
OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs
View File

@@ -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;
}