diff options
author | Melanie | 2012-07-16 23:31:55 +0100 |
---|---|---|
committer | Melanie | 2012-07-16 23:31:55 +0100 |
commit | 1c3b0da74a6e662ceebad53c82d38ba8a42795b3 (patch) | |
tree | 667cc0f0139c4aa91fed19d83c037713293526d0 /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |
parent | sending more user-friendly messages to the script error window rather than th... (diff) | |
download | opensim-SC-1c3b0da74a6e662ceebad53c82d38ba8a42795b3.zip opensim-SC-1c3b0da74a6e662ceebad53c82d38ba8a42795b3.tar.gz opensim-SC-1c3b0da74a6e662ceebad53c82d38ba8a42795b3.tar.bz2 opensim-SC-1c3b0da74a6e662ceebad53c82d38ba8a42795b3.tar.xz |
Revert "Fix script "Running" behavior"
A better solution using the already present flags must be found.
This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index f1abd4b..d570ef7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -121,8 +121,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
121 | 121 | ||
122 | public bool Running { get; set; } | 122 | public bool Running { get; set; } |
123 | 123 | ||
124 | public bool Run { get; set; } | ||
125 | |||
126 | public bool Suspended | 124 | public bool Suspended |
127 | { | 125 | { |
128 | get { return m_Suspended; } | 126 | get { return m_Suspended; } |
@@ -218,7 +216,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
218 | m_postOnRez = postOnRez; | 216 | m_postOnRez = postOnRez; |
219 | m_AttachedAvatar = part.ParentGroup.AttachedAvatar; | 217 | m_AttachedAvatar = part.ParentGroup.AttachedAvatar; |
220 | m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID; | 218 | m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID; |
221 | Run = true; | ||
222 | 219 | ||
223 | if (part != null) | 220 | if (part != null) |
224 | { | 221 | { |
@@ -360,9 +357,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
360 | 357 | ||
361 | if (m_startedFromSavedState) | 358 | if (m_startedFromSavedState) |
362 | { | 359 | { |
363 | if (!Run) | ||
364 | return; | ||
365 | |||
366 | Start(); | 360 | Start(); |
367 | if (m_postOnRez) | 361 | if (m_postOnRez) |
368 | { | 362 | { |
@@ -395,9 +389,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
395 | } | 389 | } |
396 | else | 390 | else |
397 | { | 391 | { |
398 | if (!Run) | ||
399 | return; | ||
400 | |||
401 | Start(); | 392 | Start(); |
402 | PostEvent(new EventParams("state_entry", | 393 | PostEvent(new EventParams("state_entry", |
403 | new Object[0], new DetectParams[0])); | 394 | new Object[0], new DetectParams[0])); |