aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2009-02-25 04:29:02 +0000
committerCharles Krinke2009-02-25 04:29:02 +0000
commited7256ac0c47857cd83e96d953571c47add68a6c (patch)
tree4480ac580571b1264a885f52f863144c9aa566d8
parentDistinguish 404 errors in RestClient.Request(). (diff)
downloadopensim-SC_OLD-ed7256ac0c47857cd83e96d953571c47add68a6c.zip
opensim-SC_OLD-ed7256ac0c47857cd83e96d953571c47add68a6c.tar.gz
opensim-SC_OLD-ed7256ac0c47857cd83e96d953571c47add68a6c.tar.bz2
opensim-SC_OLD-ed7256ac0c47857cd83e96d953571c47add68a6c.tar.xz
Fixes Mantis #3187. Thank you kindly, DoranZemlja for a patch that:
Deals with the multiple warning side affect introduced earlier.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs1
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index 880ba4a..bf97d5f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -87,6 +87,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
87 /// <returns>String containing the generated C# code.</returns> 87 /// <returns>String containing the generated C# code.</returns>
88 public string Convert(string script) 88 public string Convert(string script)
89 { 89 {
90 m_warnings.Clear();
90 ResetCounters(); 91 ResetCounters();
91 Parser p = new LSLSyntax(new yyLSLSyntax(), new ErrorHandler(true)); 92 Parser p = new LSLSyntax(new yyLSLSyntax(), new ErrorHandler(true));
92 // Obviously this needs to be in a try/except block. 93 // Obviously this needs to be in a try/except block.
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 5b851f6..5d5e3c5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -261,6 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
261 public string PerformScriptCompile(string Script, string asset) 261 public string PerformScriptCompile(string Script, string asset)
262 { 262 {
263 m_positionMap = null; 263 m_positionMap = null;
264 m_warnings.Clear();
264 265
265 string OutFile = Path.Combine(ScriptEnginesPath, Path.Combine( 266 string OutFile = Path.Combine(ScriptEnginesPath, Path.Combine(
266 m_scriptEngine.World.RegionInfo.RegionID.ToString(), 267 m_scriptEngine.World.RegionInfo.RegionID.ToString(),