diff options
author | Justin Clark-Casey (justincc) | 2013-01-16 01:45:09 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-16 01:45:09 +0000 |
commit | b8949024bc55c62b9268b35d4f2a568760b9d7d3 (patch) | |
tree | 7b8d984c957fab7aba5aceec66967adb5e8a0d51 /OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-b8949024bc55c62b9268b35d4f2a568760b9d7d3.zip opensim-SC-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.gz opensim-SC-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.bz2 opensim-SC-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.xz |
Revert "Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)"
Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api.
This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Helpers.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index e02d35e..5a58f73 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |||
@@ -81,24 +81,6 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
81 | } | 81 | } |
82 | } | 82 | } |
83 | 83 | ||
84 | /// <summary> | ||
85 | /// Used to signal when the script is stopping in co-operation with the script engine | ||
86 | /// (instead of through Thread.Abort()). | ||
87 | /// </summary> | ||
88 | [Serializable] | ||
89 | public class ScriptCoopStopException : Exception | ||
90 | { | ||
91 | public ScriptCoopStopException() | ||
92 | { | ||
93 | } | ||
94 | |||
95 | protected ScriptCoopStopException( | ||
96 | SerializationInfo info, | ||
97 | StreamingContext context) | ||
98 | { | ||
99 | } | ||
100 | } | ||
101 | |||
102 | public class DetectParams | 84 | public class DetectParams |
103 | { | 85 | { |
104 | public const int AGENT = 1; | 86 | public const int AGENT = 1; |