1 files changed, 35 insertions, 24 deletions

diff --git a/OpenSim/Region/ScriptEngine/XMREngine/MMRDelegateCommon.cs b/OpenSim/Region/ScriptEngine/YEngine/MMRDelegateCommon.cs
index 48b665b..433062a 100644
--- a/OpenSim/Region/ScriptEngine/XMREngine/MMRDelegateCommon.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/MMRDelegateCommon.cs
@@ -30,65 +30,76 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace OpenSim.Region.ScriptEngine.XMREngine {
+namespace OpenSim.Region.ScriptEngine.Yengine
+{
 
-    public class DelegateCommon {
+    public class DelegateCommon
+    {
         private string sig;  // rettype(arg1type,arg2type,...), eg, "void(list,string,integer)"
         private Type type;   // resultant delegate type
 
-        private static Dictionary<string, DelegateCommon> delegateCommons = new Dictionary<string, DelegateCommon> ();
-        private static Dictionary<Type, DelegateCommon> delegateCommonsBySysType = new Dictionary<Type, DelegateCommon> ();
+        private static Dictionary<string, DelegateCommon> delegateCommons = new Dictionary<string, DelegateCommon>();
+        private static Dictionary<Type, DelegateCommon> delegateCommonsBySysType = new Dictionary<Type, DelegateCommon>();
         private static ModuleBuilder delegateModuleBuilder = null;
-        public  static Type[] constructorArgTypes = new Type[] { typeof (object), typeof (IntPtr) };
+        public static Type[] constructorArgTypes = new Type[] { typeof(object), typeof(IntPtr) };
 
-        private DelegateCommon () { }
+        private DelegateCommon()
+        {
+        }
 
-        public static Type GetType (System.Type ret, System.Type[] args, string sig)
+        public static Type GetType(System.Type ret, System.Type[] args, string sig)
         {
             DelegateCommon dc;
-            lock (delegateCommons) {
-                if (!delegateCommons.TryGetValue (sig, out dc)) {
-                    dc = new DelegateCommon ();
-                    dc.sig  = sig;
-                    dc.type = CreateDelegateType (sig, ret, args);
-                    delegateCommons.Add (sig, dc);
-                    delegateCommonsBySysType.Add (dc.type, dc);
+            lock(delegateCommons)
+            {
+                if(!delegateCommons.TryGetValue(sig, out dc))
+                {
+                    dc = new DelegateCommon();
+                    dc.sig = sig;
+                    dc.type = CreateDelegateType(sig, ret, args);
+                    delegateCommons.Add(sig, dc);
+                    delegateCommonsBySysType.Add(dc.type, dc);
                 }
             }
             return dc.type;
         }
 
-        public static Type TryGetType (string sig)
+        public static Type TryGetType(string sig)
         {
             DelegateCommon dc;
-            lock (delegateCommons) {
-                if (!delegateCommons.TryGetValue (sig, out dc)) dc = null;
+            lock(delegateCommons)
+            {
+                if(!delegateCommons.TryGetValue(sig, out dc))
+                    dc = null;
             }
             return (dc == null) ? null : dc.type;
         }
 
-        public static string TryGetName (Type t)
+        public static string TryGetName(Type t)
         {
             DelegateCommon dc;
-            lock (delegateCommons) {
-                if (!delegateCommonsBySysType.TryGetValue (t, out dc)) dc = null;
+            lock(delegateCommons)
+            {
+                if(!delegateCommonsBySysType.TryGetValue(t, out dc))
+                    dc = null;
             }
             return (dc == null) ? null : dc.sig;
         }
 
         // http://blog.bittercoder.com/PermaLink,guid,a770377a-b1ad-4590-9145-36381757a52b.aspx
-        private static Type CreateDelegateType (string name, Type retType, Type[] argTypes)
+        private static Type CreateDelegateType(string name, Type retType, Type[] argTypes)
         {
-            if (delegateModuleBuilder == null) {
+            if(delegateModuleBuilder == null)
+            {
                 AssemblyName assembly = new AssemblyName();
                 assembly.Name = "CustomDelegateAssembly";
                 AssemblyBuilder assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(assembly, AssemblyBuilderAccess.Run);
                 delegateModuleBuilder = assemblyBuilder.DefineDynamicModule("CustomDelegateModule");
             }
 
-            TypeBuilder typeBuilder = delegateModuleBuilder.DefineType(name, 
+            TypeBuilder typeBuilder = delegateModuleBuilder.DefineType(name,
                 TypeAttributes.Public | TypeAttributes.Sealed | TypeAttributes.Class |
-                TypeAttributes.AnsiClass | TypeAttributes.AutoClass, typeof (MulticastDelegate));
+                TypeAttributes.AnsiClass | TypeAttributes.AutoClass, typeof(MulticastDelegate));
 
             ConstructorBuilder constructorBuilder = typeBuilder.DefineConstructor(
                 MethodAttributes.RTSpecialName | MethodAttributes.HideBySig | MethodAttributes.Public,