diff options
author | Tedd Hansen | 2008-02-07 16:37:28 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-02-07 16:37:28 +0000 |
commit | 97ec8cba62f755916d6e58adcc0d959d5bdbed3f (patch) | |
tree | bf2fead23e95a548f6f78ad9f6d2f154b180ab38 /OpenSim | |
parent | Same VB.Net patch done right. (diff) | |
download | opensim-SC-97ec8cba62f755916d6e58adcc0d959d5bdbed3f.zip opensim-SC-97ec8cba62f755916d6e58adcc0d959d5bdbed3f.tar.gz opensim-SC-97ec8cba62f755916d6e58adcc0d959d5bdbed3f.tar.bz2 opensim-SC-97ec8cba62f755916d6e58adcc0d959d5bdbed3f.tar.xz |
Maybe VB.Net will compile now... who knows ;)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index 6ea8187..ae60a47 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
58 | /// <summary> | 58 | /// <summary> |
59 | /// This contains number of lines WE use for header when compiling script. User will get error in line x-LinesToRemoveOnError when error occurs. | 59 | /// This contains number of lines WE use for header when compiling script. User will get error in line x-LinesToRemoveOnError when error occurs. |
60 | /// </summary> | 60 | /// </summary> |
61 | public int LinesToRemoveOnError = 2; | 61 | public int LinesToRemoveOnError = 3; |
62 | private enumCompileType DefaultCompileLanguage; | 62 | private enumCompileType DefaultCompileLanguage; |
63 | private bool WriteScriptSourceToDebugFile; | 63 | private bool WriteScriptSourceToDebugFile; |
64 | private bool CompileWithDebugInformation; | 64 | private bool CompileWithDebugInformation; |
@@ -273,30 +273,30 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
273 | { | 273 | { |
274 | case enumCompileType.cs: | 274 | case enumCompileType.cs: |
275 | compileScript = String.Empty + | 275 | compileScript = String.Empty + |
276 | "using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;" + | 276 | "using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;\r\n" + |
277 | String.Empty + "namespace SecondLife { " + | 277 | String.Empty + "namespace SecondLife { " + |
278 | String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { " + | 278 | String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { \r\n" + |
279 | @"public Script() { } " + | 279 | @"public Script() { } " + |
280 | compileScript + | 280 | compileScript + |
281 | "} }\r\n\r\n"; | 281 | "} }\r\n"; |
282 | break; | 282 | break; |
283 | case enumCompileType.vb: | 283 | case enumCompileType.vb: |
284 | compileScript = String.Empty + | 284 | compileScript = String.Empty + |
285 | "Imports OpenSim.Region.ScriptEngine.Common: Imports System.Collections.Generic: " + | 285 | "Imports OpenSim.Region.ScriptEngine.Common: Imports System.Collections.Generic: " + |
286 | String.Empty + "NameSpace SecondLife:" + | 286 | String.Empty + "NameSpace SecondLife:" + |
287 | String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.LSL_BaseClass: " + | 287 | String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.LSL_BaseClass: " + |
288 | "Public Sub New()\r\nEnd Sub: " + | 288 | "\r\nPublic Sub New()\r\nEnd Sub: " + |
289 | compileScript + | 289 | compileScript + |
290 | ":End Class :End Namespace\r\n"; | 290 | ":End Class :End Namespace\r\n"; |
291 | break; | 291 | break; |
292 | case enumCompileType.js: | 292 | case enumCompileType.js: |
293 | compileScript = String.Empty + | 293 | compileScript = String.Empty + |
294 | "import OpenSim.Region.ScriptEngine.Common; import System.Collections.Generic;" + | 294 | "import OpenSim.Region.ScriptEngine.Common; import System.Collections.Generic;\r\n" + |
295 | "namespace SecondLife { " + | 295 | "namespace SecondLife { " + |
296 | "class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { " + | 296 | "class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { \r\n" + |
297 | @"public Script() { } " + | 297 | @"public Script() { } " + |
298 | compileScript + | 298 | compileScript + |
299 | "} }\r\n\r\n"; | 299 | "} }\r\n"; |
300 | break; | 300 | break; |
301 | } | 301 | } |
302 | return CompileFromCSorVBText(compileScript, l); | 302 | return CompileFromCSorVBText(compileScript, l); |