diff options
author | UbitUmarov | 2018-11-15 01:24:46 +0000 |
---|---|---|
committer | UbitUmarov | 2018-11-15 01:24:46 +0000 |
commit | f44569eee52f3da88e93bb5aaaea2a08aea42ada (patch) | |
tree | 4f712ba63e7aaf65598ddf6efe8724d6af7ad259 /OpenSim/Region/ScriptEngine/YEngine | |
parent | Fixed spelling error (availble -> available) (diff) | |
download | opensim-SC-f44569eee52f3da88e93bb5aaaea2a08aea42ada.zip opensim-SC-f44569eee52f3da88e93bb5aaaea2a08aea42ada.tar.gz opensim-SC-f44569eee52f3da88e93bb5aaaea2a08aea42ada.tar.bz2 opensim-SC-f44569eee52f3da88e93bb5aaaea2a08aea42ada.tar.xz |
Yengine: ignore llResetScript() in default state_entry like X does. No idea why some do it, but do
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs index b6f8874..6fe11d8 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs | |||
@@ -215,6 +215,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
215 | */ | 215 | */ |
216 | public void ApiReset() | 216 | public void ApiReset() |
217 | { | 217 | { |
218 | // do not do llResetScript on entry | ||
219 | if(eventCode == ScriptEventCode.state_entry && stateCode == 0) | ||
220 | return; | ||
218 | ClearQueueExceptLinkMessages(); | 221 | ClearQueueExceptLinkMessages(); |
219 | throw new ScriptResetException(); | 222 | throw new ScriptResetException(); |
220 | } | 223 | } |