aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2008-01-22 09:00:49 +0000
committerTedd Hansen2008-01-22 09:00:49 +0000
commit50dcd33bab23c92854c34a5e18f1ba92273b2bd2 (patch)
tree87cdeb486f5a4a1c83899c95dd37d9f48d21ea06
parent* Enabled dead region tracking for ChildAgentDataUpdates (diff)
downloadopensim-SC_OLD-50dcd33bab23c92854c34a5e18f1ba92273b2bd2.zip
opensim-SC_OLD-50dcd33bab23c92854c34a5e18f1ba92273b2bd2.tar.gz
opensim-SC_OLD-50dcd33bab23c92854c34a5e18f1ba92273b2bd2.tar.bz2
opensim-SC_OLD-50dcd33bab23c92854c34a5e18f1ba92273b2bd2.tar.xz
Giving Mantis #388 a shot
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index f3302ee..b35d562 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -73,7 +73,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
73 73
74 // QUOTE REPLACEMENT 74 // QUOTE REPLACEMENT
75 // temporarily replace quotes so we can work our magic on the script without 75 // temporarily replace quotes so we can work our magic on the script without
76 // always considering if we are inside our outside String.Empty's 76 // always considering if we are inside our outside quotes's
77 // TODO: Does this work on half-quotes in strings? ;)
77 string _Script = System.String.Empty; 78 string _Script = System.String.Empty;
78 string C; 79 string C;
79 bool in_quote = false; 80 bool in_quote = false;
@@ -251,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
251 // Add "void" in front of functions that needs it 252 // Add "void" in front of functions that needs it
252 Script = 253 Script =
253 Regex.Replace(Script, 254 Regex.Replace(Script,
254 @"^(\s*public\s+)((?!(if|switch|for)[^a-zA-Z0-9_])[a-zA-Z0-9_]*\s*\([^\)]*\)[^;]*\{)", 255 @"^(\s*public\s+)?((?!(if|switch|for)[^a-zA-Z0-9_])[a-zA-Z0-9_]*\s*\([^\)]*\)[^;]*\{)",
255 @"$1void $2", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); 256 @"$1void $2", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
256 257
257 // Replace <x,y,z> and <x,y,z,r> 258 // Replace <x,y,z> and <x,y,z,r>