diff options
author | Charles Krinke | 2008-07-21 13:44:56 +0000 |
---|---|---|
committer | Charles Krinke | 2008-07-21 13:44:56 +0000 |
commit | cda320663390a8b0d5e353f997e3d395991bf512 (patch) | |
tree | 65e19a13a037ad5ded6d839c09f6c8be42137100 /OpenSim/Region | |
parent | Mantis#1798. Thank you kindly, StrawberryFride for a patch that: (diff) | |
download | opensim-SC-cda320663390a8b0d5e353f997e3d395991bf512.zip opensim-SC-cda320663390a8b0d5e353f997e3d395991bf512.tar.gz opensim-SC-cda320663390a8b0d5e353f997e3d395991bf512.tar.bz2 opensim-SC-cda320663390a8b0d5e353f997e3d395991bf512.tar.xz |
Mantis#1801. Thank you kindly, Junta_Kohime for a patch that:
I found a problem trying to get s value directly from a quaternion q.
Compiling a script which directly access to q.s value, caused the
following error:
CS0103: 'The . symbol cannot be used in LSL except in float values
or vector components'. Detected around: q.s
I did a small change to allow alphabetic letter "s" to be interpretated
as valid identifier. This solves the problem.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs | 2 |
2 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 1613502..371ba45 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | |||
@@ -124,7 +124,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
124 | Match SecurityM; | 124 | Match SecurityM; |
125 | 125 | ||
126 | 126 | ||
127 | SecurityM = Regex.Match(checkscript, @"([a-zA-Z])\.(?:[a-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); | 127 | SecurityM = Regex.Match(checkscript, @"([a-zA-Z])\.(?:[a-rt-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); |
128 | if (SecurityM.Success) | 128 | if (SecurityM.Success) |
129 | throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'. Detected around: " + SecurityM.Captures[0].Value); | 129 | throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'. Detected around: " + SecurityM.Captures[0].Value); |
130 | 130 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs index 7e9789f..57e8776 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs | |||
@@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
122 | Match SecurityM; | 122 | Match SecurityM; |
123 | 123 | ||
124 | // BROKEN: this check is very wrong. It block's any url in strings. | 124 | // BROKEN: this check is very wrong. It block's any url in strings. |
125 | SecurityM = Regex.Match(checkscript, @"(?:[a-zA-Z])\.(?:[a-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); | 125 | SecurityM = Regex.Match(checkscript, @"(?:[a-zA-Z])\.(?:[a-rt-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); |
126 | 126 | ||
127 | if (SecurityM.Success) | 127 | if (SecurityM.Success) |
128 | throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'. Detected around: " + SecurityM.Captures[0].Value); | 128 | throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'. Detected around: " + SecurityM.Captures[0].Value); |