From 1d02636c27de64f8acec5bb9a76f8659f0bfdd2b Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 22 May 2009 14:57:00 +0000 Subject: cleaning out warnings. NOTE: we currently have a gazillion warnings caused stuff flagged as "obsolete" (OGS1 stuff) --- what's up with that? --- .../Shared/Api/Implementation/LSL_Api.cs | 2 +- .../ScriptEngine/Shared/CodeTools/lsl.lexer.cs | 1 - .../ScriptEngine/Shared/Instance/ScriptInstance.cs | 21 ++++++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared') 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 // ScriptSleep(1000); return tid.ToString(); } - catch(Exception e) + catch(Exception) { //m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString()); 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 case 946: { ((LSLTokens)yym).str += yytext; } break; case 1010: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } - break; case 1015: { yym.yy_begin("COMMENT"); } break; 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 //m_ScriptSponsor = scriptSponsor; } - catch (Exception e) + catch (Exception) { // m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); } @@ -283,7 +283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance part.SetScriptEvents(m_ItemID, (int)m_Script.GetStateEventFlags(State)); } - catch (Exception e) + catch (Exception) { // m_log.Error("[Script] Error loading script instance\n"+e.ToString()); return; @@ -350,7 +350,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance // m_log.Error("[Script] Unable to load script state: Memory limit exceeded"); } } - catch (Exception e) + catch (Exception) { // m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml); } @@ -455,10 +455,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance public void VarDump(Dictionary vars) { // m_log.Info("Variable dump for script "+ m_ItemID.ToString()); - foreach (KeyValuePair v in vars) - { + // foreach (KeyValuePair v in vars) + // { // m_log.Info("Variable: "+v.Key+" = "+v.Value.ToString()); - } + // } } public void Start() @@ -727,15 +727,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance part.AbsolutePosition, part.Name, part.UUID, false); } - catch (Exception e2) // LEGIT: User Scripting + catch (Exception) { + } + // catch (Exception e2) // LEGIT: User Scripting + // { // m_log.Error("[SCRIPT]: "+ // "Error displaying error in-world: " + // e2.ToString()); // m_log.Error("[SCRIPT]: " + // "Errormessage: Error compiling script:\r\n" + // e.ToString()); - } + // } } else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) { @@ -890,7 +893,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance fs.Write(buf, 0, buf.Length); fs.Close(); } - catch(Exception e) + catch(Exception) { // m_log.Error("Unable to save xml\n"+e.ToString()); } -- cgit v1.1