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 06be20e..69aa0b0 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
                        // 0 => 1: Get last 
                        Match m =
                          //Regex.Match(cache, @"(?![a-zA-Z_]+)\s*([a-zA-Z_]+)[^a-zA-Z_\(\)]*{",
-                            Regex.Match(cache, @"(?![a-zA-Z_]+)\s*(state\s+)?(?<statename>[a-zA-Z_]+)[^a-zA-Z_\(\)]*{",
+                            Regex.Match(cache, @"(?![a-zA-Z_]+)\s*(state\s+)?(?<statename>[a-zA-Z_][a-zA-Z_0-9]*)[^a-zA-Z_0-9\(\)]*{",
                                        RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
@@ -211,7 +211,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
                            cache =
                                              //@"(?<s1>(?![a-zA-Z_]+)\s*)" + @"([a-zA-Z_]+)(?<s2>[^a-zA-Z_\(\)]*){",
                                Regex.Replace(cache,
-                                              @"(?<s1>(?![a-zA-Z_]+)\s*)" + @"(state\s+)?([a-zA-Z_]+)(?<s2>[^a-zA-Z_\(\)]*){",
+                                              @"(?<s1>(?![a-zA-Z_]+)\s*)" + @"(state\s+)?([a-zA-Z_][a-zA-Z_0-9]*)(?<s2>[^a-zA-Z_0-9\(\)]*){",
                                              "${s1}${s2}",
                                              RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline | RegexOptions.IgnoreCase);
                        }

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index 06be20e..69aa0b0 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
197	// 0 => 1: Get last	197	// 0 => 1: Get last
198	Match m =	198	Match m =
199	//Regex.Match(cache, @"(?![a-zA-Z_]+)\s([a-zA-Z_]+)[^a-zA-Z_\(\)]{",	199	//Regex.Match(cache, @"(?![a-zA-Z_]+)\s([a-zA-Z_]+)[^a-zA-Z_\(\)]{",
200	Regex.Match(cache, @"(?![a-zA-Z_]+)\s(state\s+)?(?<statename>[a-zA-Z_]+)[^a-zA-Z_\(\)]{",	200	Regex.Match(cache, @"(?![a-zA-Z_]+)\s(state\s+)?(?<statename>[a-zA-Z_][a-zA-Z_0-9])[^a-zA-Z_0-9\(\)]*{",
201		201
202	RegexOptions.Compiled \| RegexOptions.Multiline \| RegexOptions.Singleline);	202	RegexOptions.Compiled \| RegexOptions.Multiline \| RegexOptions.Singleline);
203		203
@@ -211,7 +211,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
211	cache =	211	cache =
212	//@"(?<s1>(?![a-zA-Z_]+)\s)" + @"([a-zA-Z_]+)(?<s2>[^a-zA-Z_\(\)]){",	212	//@"(?<s1>(?![a-zA-Z_]+)\s)" + @"([a-zA-Z_]+)(?<s2>[^a-zA-Z_\(\)]){",
213	Regex.Replace(cache,	213	Regex.Replace(cache,
214	@"(?<s1>(?![a-zA-Z_]+)\s)" + @"(state\s+)?([a-zA-Z_]+)(?<s2>[^a-zA-Z_\(\)]){",	214	@"(?<s1>(?![a-zA-Z_]+)\s)" + @"(state\s+)?([a-zA-Z_][a-zA-Z_0-9])(?<s2>[^a-zA-Z_0-9\(\)]*){",
215	"${s1}${s2}",	215	"${s1}${s2}",
216	RegexOptions.Compiled \| RegexOptions.Multiline \| RegexOptions.Singleline \| RegexOptions.IgnoreCase);	216	RegexOptions.Compiled \| RegexOptions.Multiline \| RegexOptions.Singleline \| RegexOptions.IgnoreCase);
217	}	217	}