diff options
author | onefang | 2019-06-04 00:50:59 +1000 |
---|---|---|
committer | onefang | 2019-06-04 00:50:59 +1000 |
commit | cdb1851f438349a8721c0d9cef54837d0b302189 (patch) | |
tree | 1a1c7255ac4343ecf44bdd5387903f467a6b7626 /OpenSim/Region/ScriptEngine/Shared | |
parent | Adjust [AuthorizationService] sections to use the new DefaultRegionAccess. (diff) | |
download | opensim-SC-cdb1851f438349a8721c0d9cef54837d0b302189.zip opensim-SC-cdb1851f438349a8721c0d9cef54837d0b302189.tar.gz opensim-SC-cdb1851f438349a8721c0d9cef54837d0b302189.tar.bz2 opensim-SC-cdb1851f438349a8721c0d9cef54837d0b302189.tar.xz |
Warnings--
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs index 66210b7..9dc8d05 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs | |||
@@ -19720,7 +19720,7 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool | |||
19720 | case 1076: ; | 19720 | case 1076: ; |
19721 | break; | 19721 | break; |
19722 | case 1032: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } | 19722 | case 1032: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } |
19723 | break; | 19723 | // break; |
19724 | case 1067: ; | 19724 | case 1067: ; |
19725 | break; | 19725 | break; |
19726 | case 1072: ; | 19726 | case 1072: ; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 9d72b1c..5342c28 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -771,7 +771,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
771 | /// <returns></returns> | 771 | /// <returns></returns> |
772 | public object EventProcessor() | 772 | public object EventProcessor() |
773 | { | 773 | { |
774 | EventParams data = null; | 774 | // EventParams data = null; |
775 | // We check here as the thread stopping this instance from running may itself hold the m_Script lock. | 775 | // We check here as the thread stopping this instance from running may itself hold the m_Script lock. |
776 | if (!Running) | 776 | if (!Running) |
777 | return 0; | 777 | return 0; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs index 241a24d..8ceb4cc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs | |||
@@ -157,7 +157,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
157 | using (HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse()) | 157 | using (HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse()) |
158 | {} | 158 | {} |
159 | } | 159 | } |
160 | catch (WebException e) | 160 | catch (WebException) |
161 | { | 161 | { |
162 | // using (HttpWebResponse response = (HttpWebResponse)e.Response) | 162 | // using (HttpWebResponse response = (HttpWebResponse)e.Response) |
163 | // gotExpectedException = response.StatusCode == HttpStatusCode.NotFound; | 163 | // gotExpectedException = response.StatusCode == HttpStatusCode.NotFound; |