diff options
author | Tedd Hansen | 2008-02-24 16:41:56 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-02-24 16:41:56 +0000 |
commit | 8af64c979fcc993615243d66f03903173ab933b0 (patch) | |
tree | 2eb740170947f48af679b673ac50832f11411f30 /OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs | |
parent | Forgot to change what class compiled scripts must inherit from to get their c... (diff) | |
download | opensim-SC-8af64c979fcc993615243d66f03903173ab933b0.zip opensim-SC-8af64c979fcc993615243d66f03903173ab933b0.tar.gz opensim-SC-8af64c979fcc993615243d66f03903173ab933b0.tar.bz2 opensim-SC-8af64c979fcc993615243d66f03903173ab933b0.tar.xz |
By now you all have learned that when I'm committing scripting usually doesn't work, so no big surprise. :)
Modified baseclass for compiled script to incorp new OSSL commands class and renamed it to follow standards and all that. Scripts may work again. :)
Diffstat (limited to 'OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs index c6fa4ce..a64f580 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | |||
86 | TypeBuilder typeBuilder = modBuilder.DefineType( | 86 | TypeBuilder typeBuilder = modBuilder.DefineType( |
87 | "LSL_ScriptObject", | 87 | "LSL_ScriptObject", |
88 | TypeAttributes.Public | TypeAttributes.BeforeFieldInit, | 88 | TypeAttributes.Public | TypeAttributes.BeforeFieldInit, |
89 | typeof (LSL_BaseClass)); | 89 | typeof (BuiltIn_Commands_BaseClass)); |
90 | //, | 90 | //, |
91 | // typeof()); | 91 | // typeof()); |
92 | //, typeof(LSL_BuiltIn_Commands_Interface)); | 92 | //, typeof(LSL_BuiltIn_Commands_Interface)); |
@@ -179,7 +179,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | |||
179 | new Type[0]); | 179 | new Type[0]); |
180 | 180 | ||
181 | //Define the reflection ConstructorInfor for System.Object | 181 | //Define the reflection ConstructorInfor for System.Object |
182 | ConstructorInfo conObj = typeof (LSL_BaseClass).GetConstructor(new Type[0]); | 182 | ConstructorInfo conObj = typeof (BuiltIn_Commands_BaseClass).GetConstructor(new Type[0]); |
183 | 183 | ||
184 | //call constructor of base object | 184 | //call constructor of base object |
185 | ILGenerator il = constructor.GetILGenerator(); | 185 | ILGenerator il = constructor.GetILGenerator(); |
@@ -272,7 +272,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | |||
272 | 272 | ||
273 | // Make call | 273 | // Make call |
274 | il.Emit(OpCodes.Call, | 274 | il.Emit(OpCodes.Call, |
275 | typeof (LSL_BaseClass).GetMethod("AddToStatic", new Type[] {typeof (UInt32), datatype})); | 275 | typeof (BuiltIn_Commands_BaseClass).GetMethod("AddToStatic", new Type[] {typeof (UInt32), datatype})); |
276 | } | 276 | } |
277 | } | 277 | } |
278 | 278 | ||