diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
3 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 519dd2b..f932dbe 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -8114,7 +8114,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8114 | // ScriptSleep(1000); | 8114 | // ScriptSleep(1000); |
8115 | return tid.ToString(); | 8115 | return tid.ToString(); |
8116 | } | 8116 | } |
8117 | catch(Exception e) | 8117 | catch(Exception) |
8118 | { | 8118 | { |
8119 | //m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString()); | 8119 | //m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString()); |
8120 | return UUID.Zero.ToString(); | 8120 | return UUID.Zero.ToString(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs index cad27b7..a06e657 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs | |||
@@ -18785,7 +18785,6 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool | |||
18785 | case 946: { ((LSLTokens)yym).str += yytext; } | 18785 | case 946: { ((LSLTokens)yym).str += yytext; } |
18786 | break; | 18786 | break; |
18787 | case 1010: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } | 18787 | case 1010: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } |
18788 | break; | ||
18789 | case 1015: { yym.yy_begin("COMMENT"); } | 18788 | case 1015: { yym.yy_begin("COMMENT"); } |
18790 | break; | 18789 | break; |
18791 | case 1027: { yym.yy_begin("YYINITIAL"); } | 18790 | case 1027: { yym.yy_begin("YYINITIAL"); } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 40c48d9..32dc0f4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -266,7 +266,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
266 | //m_ScriptSponsor = scriptSponsor; | 266 | //m_ScriptSponsor = scriptSponsor; |
267 | 267 | ||
268 | } | 268 | } |
269 | catch (Exception e) | 269 | catch (Exception) |
270 | { | 270 | { |
271 | // m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); | 271 | // m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); |
272 | } | 272 | } |
@@ -283,7 +283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
283 | part.SetScriptEvents(m_ItemID, | 283 | part.SetScriptEvents(m_ItemID, |
284 | (int)m_Script.GetStateEventFlags(State)); | 284 | (int)m_Script.GetStateEventFlags(State)); |
285 | } | 285 | } |
286 | catch (Exception e) | 286 | catch (Exception) |
287 | { | 287 | { |
288 | // m_log.Error("[Script] Error loading script instance\n"+e.ToString()); | 288 | // m_log.Error("[Script] Error loading script instance\n"+e.ToString()); |
289 | return; | 289 | return; |
@@ -350,7 +350,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
350 | // m_log.Error("[Script] Unable to load script state: Memory limit exceeded"); | 350 | // m_log.Error("[Script] Unable to load script state: Memory limit exceeded"); |
351 | } | 351 | } |
352 | } | 352 | } |
353 | catch (Exception e) | 353 | catch (Exception) |
354 | { | 354 | { |
355 | // m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml); | 355 | // m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml); |
356 | } | 356 | } |
@@ -455,10 +455,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
455 | public void VarDump(Dictionary<string, object> vars) | 455 | public void VarDump(Dictionary<string, object> vars) |
456 | { | 456 | { |
457 | // m_log.Info("Variable dump for script "+ m_ItemID.ToString()); | 457 | // m_log.Info("Variable dump for script "+ m_ItemID.ToString()); |
458 | foreach (KeyValuePair<string, object> v in vars) | 458 | // foreach (KeyValuePair<string, object> v in vars) |
459 | { | 459 | // { |
460 | // m_log.Info("Variable: "+v.Key+" = "+v.Value.ToString()); | 460 | // m_log.Info("Variable: "+v.Key+" = "+v.Value.ToString()); |
461 | } | 461 | // } |
462 | } | 462 | } |
463 | 463 | ||
464 | public void Start() | 464 | public void Start() |
@@ -727,15 +727,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
727 | part.AbsolutePosition, | 727 | part.AbsolutePosition, |
728 | part.Name, part.UUID, false); | 728 | part.Name, part.UUID, false); |
729 | } | 729 | } |
730 | catch (Exception e2) // LEGIT: User Scripting | 730 | catch (Exception) |
731 | { | 731 | { |
732 | } | ||
733 | // catch (Exception e2) // LEGIT: User Scripting | ||
734 | // { | ||
732 | // m_log.Error("[SCRIPT]: "+ | 735 | // m_log.Error("[SCRIPT]: "+ |
733 | // "Error displaying error in-world: " + | 736 | // "Error displaying error in-world: " + |
734 | // e2.ToString()); | 737 | // e2.ToString()); |
735 | // m_log.Error("[SCRIPT]: " + | 738 | // m_log.Error("[SCRIPT]: " + |
736 | // "Errormessage: Error compiling script:\r\n" + | 739 | // "Errormessage: Error compiling script:\r\n" + |
737 | // e.ToString()); | 740 | // e.ToString()); |
738 | } | 741 | // } |
739 | } | 742 | } |
740 | else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) | 743 | else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) |
741 | { | 744 | { |
@@ -890,7 +893,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
890 | fs.Write(buf, 0, buf.Length); | 893 | fs.Write(buf, 0, buf.Length); |
891 | fs.Close(); | 894 | fs.Close(); |
892 | } | 895 | } |
893 | catch(Exception e) | 896 | catch(Exception) |
894 | { | 897 | { |
895 | // m_log.Error("Unable to save xml\n"+e.ToString()); | 898 | // m_log.Error("Unable to save xml\n"+e.ToString()); |
896 | } | 899 | } |