aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoralondria2008-02-06 02:30:05 +0000
committeralondria2008-02-06 02:30:05 +0000
commit52af2649489e58c15e8a06f58d9a7ed8c887855d (patch)
tree6afad09cda6fe9cd8a34d1a78f7a740160a08f8e
parentSomehow llList2Float never made it into LSL_BaseClass and LSL_BuiltIn_Command... (diff)
downloadopensim-SC_OLD-52af2649489e58c15e8a06f58d9a7ed8c887855d.zip
opensim-SC_OLD-52af2649489e58c15e8a06f58d9a7ed8c887855d.tar.gz
opensim-SC_OLD-52af2649489e58c15e8a06f58d9a7ed8c887855d.tar.bz2
opensim-SC_OLD-52af2649489e58c15e8a06f58d9a7ed8c887855d.tar.xz
Fixed regex in LSL2CSConverter so it will properly handle casting to (string) part of vector (eg. vector.z)
This fixes Mantis 388
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 314f3f0..31efeb7 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -271,10 +271,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
271 271
272 // Replace (string) to .ToString() // 272 // Replace (string) to .ToString() //
273 Script = 273 Script =
274 Regex.Replace(Script, @"\(string\)\s*([a-zA-Z0-9_]+(\s*\([^\)]*\))?)", @"$1.ToString()", 274 Regex.Replace(Script, @"\(string\)\s*([a-zA-Z0-9_.]+(\s*\([^\)]*\))?)", @"$1.ToString()",
275 RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); 275 RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
276 Script = 276 Script =
277 Regex.Replace(Script, @"\((float|int)\)\s*([a-zA-Z0-9_]+(\s*\([^\)]*\))?)", @"$1.Parse($2)", 277 Regex.Replace(Script, @"\((float|int)\)\s*([a-zA-Z0-9_.]+(\s*\([^\)]*\))?)", @"$1.Parse($2)",
278 RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); 278 RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
279 279
280 280