aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2019-02-20 04:04:35 +0000
committerUbitUmarov2019-02-20 04:04:35 +0000
commit7c0eab8a23a4e2998b5035c7b5de04578e3896fb (patch)
tree1841098259893a5c4a149b611e440e55b94cd44c /OpenSim
parentestate kick now just kill user connection if on same region. The teleport hom... (diff)
downloadopensim-SC-7c0eab8a23a4e2998b5035c7b5de04578e3896fb.zip
opensim-SC-7c0eab8a23a4e2998b5035c7b5de04578e3896fb.tar.gz
opensim-SC-7c0eab8a23a4e2998b5035c7b5de04578e3896fb.tar.bz2
opensim-SC-7c0eab8a23a4e2998b5035c7b5de04578e3896fb.tar.xz
Xengine: don't lose state change events
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 019a0d9..ef4d6ec 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -699,7 +699,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
699 // If min event delay is set then ignore any events untill the time has expired 699 // If min event delay is set then ignore any events untill the time has expired
700 // This currently only allows 1 event of any type in the given time period. 700 // This currently only allows 1 event of any type in the given time period.
701 // This may need extending to allow for a time for each individual event type. 701 // This may need extending to allow for a time for each individual event type.
702 if (m_eventDelayTicks != 0) 702 if (m_eventDelayTicks != 0 && data.EventName != "state" && data.EventName != "state_entry" && data.EventName != "state_exit")
703 { 703 {
704 if (DateTime.Now.Ticks < m_nextEventTimeTicks) 704 if (DateTime.Now.Ticks < m_nextEventTimeTicks)
705 return; 705 return;