aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2019-02-20 04:54:32 +0000
committerUbitUmarov2019-02-20 04:54:32 +0000
commitac651a168abc2c69214d2957a6d6fa83abe9dec4 (patch)
treed313925f2fcc14e42e6593c2ba280e8499458eb9 /OpenSim
parentmissing file on the kick commit (diff)
downloadopensim-SC-ac651a168abc2c69214d2957a6d6fa83abe9dec4.zip
opensim-SC-ac651a168abc2c69214d2957a6d6fa83abe9dec4.tar.gz
opensim-SC-ac651a168abc2c69214d2957a6d6fa83abe9dec4.tar.bz2
opensim-SC-ac651a168abc2c69214d2957a6d6fa83abe9dec4.tar.xz
Xengine: exclude a few more events from mineventdelay
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index ef4d6ec..351fca9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -699,7 +699,9 @@ 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 && data.EventName != "state" && data.EventName != "state_entry" && data.EventName != "state_exit") 702 if (m_eventDelayTicks != 0 &&
703 data.EventName != "state" && data.EventName != "state_entry" && data.EventName != "state_exit"
704 && data.EventName != "run_time_permissions" && data.EventName != "http_request" && data.EventName != "link_message")
703 { 705 {
704 if (DateTime.Now.Ticks < m_nextEventTimeTicks) 706 if (DateTime.Now.Ticks < m_nextEventTimeTicks)
705 return; 707 return;