aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
diff options
context:
space:
mode:
authorCasperW2009-11-23 16:02:05 +0100
committerCasperW2009-11-23 17:59:24 +0100
commit889ce36afa67c521f3e50e4833a894ffd39af490 (patch)
tree0316fd068a571a7dfe4c8f983220a330eb457fa0 /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
parentRevert "testing checkout" (diff)
downloadopensim-SC-889ce36afa67c521f3e50e4833a894ffd39af490.zip
opensim-SC-889ce36afa67c521f3e50e4833a894ffd39af490.tar.gz
opensim-SC-889ce36afa67c521f3e50e4833a894ffd39af490.tar.bz2
opensim-SC-889ce36afa67c521f3e50e4833a894ffd39af490.tar.xz
Added some [DebuggerNonUserCode] modifiers to functions that throw EventAbortException() to ease debugging on Visual Studio
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 41b5d49..ed3fdbe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Diagnostics; //for [DebuggerNonUserCode]
30using System.Runtime.Remoting; 31using System.Runtime.Remoting;
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using System.Threading; 33using System.Threading;
@@ -544,6 +545,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
544 return true; 545 return true;
545 } 546 }
546 547
548 [DebuggerNonUserCode] //Prevents the debugger from farting in this function
547 public void SetState(string state) 549 public void SetState(string state)
548 { 550 {
549 if (state == State) 551 if (state == State)
@@ -555,7 +557,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
555 new DetectParams[0])); 557 new DetectParams[0]));
556 PostEvent(new EventParams("state_entry", new Object[0], 558 PostEvent(new EventParams("state_entry", new Object[0],
557 new DetectParams[0])); 559 new DetectParams[0]));
558 560
559 throw new EventAbortException(); 561 throw new EventAbortException();
560 } 562 }
561 563
@@ -824,6 +826,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
824 new Object[0], new DetectParams[0])); 826 new Object[0], new DetectParams[0]));
825 } 827 }
826 828
829 [DebuggerNonUserCode] //Stops the VS debugger from farting in this function
827 public void ApiResetScript() 830 public void ApiResetScript()
828 { 831 {
829 // bool running = Running; 832 // bool running = Running;