diff options
author | Charles Krinke | 2007-12-14 16:10:56 +0000 |
---|---|---|
committer | Charles Krinke | 2007-12-14 16:10:56 +0000 |
commit | 9ca70e029aed533a2cd702e4b21ed937f49b7aa8 (patch) | |
tree | 1c406c574fd7617600c32bfa049fba44bcd1f416 /OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL | |
parent | * Just making Create public (diff) | |
download | opensim-SC-9ca70e029aed533a2cd702e4b21ed937f49b7aa8.zip opensim-SC-9ca70e029aed533a2cd702e4b21ed937f49b7aa8.tar.gz opensim-SC-9ca70e029aed533a2cd702e4b21ed937f49b7aa8.tar.bz2 opensim-SC-9ca70e029aed533a2cd702e4b21ed937f49b7aa8.tar.xz |
Again, thanks to Alondria for: adding llGetTime, llResetTime, and llGetAndResetTime.
Also for fixing Rot/Vector Regex from being too greedy by removing bug in the
LSL->C# converter that was causing the vector and rotation parser.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index 8155b44..d9ebd14 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | |||
@@ -248,10 +248,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
248 | 248 | ||
249 | // Replace <x,y,z> and <x,y,z,r> | 249 | // Replace <x,y,z> and <x,y,z,r> |
250 | Script = | 250 | Script = |
251 | Regex.Replace(Script, @"<([^,>]*,[^,>]*,[^,>]*,[^,>]*)>", @"new LSL_Types.Quaternion($1)", | 251 | Regex.Replace(Script, @"<([^,>;\)]*,[^,>;\)]*,[^,>;\)]*,[^,>;\)]*)>", @"new LSL_Types.Quaternion($1)", |
252 | RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); | 252 | RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); |
253 | Script = | 253 | Script = |
254 | Regex.Replace(Script, @"<([^,>]*,[^,>]*,[^,>]*)>", @"new LSL_Types.Vector3($1)", | 254 | Regex.Replace(Script, @"<([^,>;\)]*,[^,>;\)]*,[^,>;\)]*)>", @"new LSL_Types.Vector3($1)", |
255 | RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); | 255 | RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); |
256 | 256 | ||
257 | // Replace List []'s | 257 | // Replace List []'s |
@@ -317,4 +317,4 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
317 | return Return; | 317 | return Return; |
318 | } | 318 | } |
319 | } | 319 | } |
320 | } \ No newline at end of file | 320 | } |