diff options
author | Melanie | 2010-12-03 04:39:51 +0100 |
---|---|---|
committer | Melanie | 2010-12-03 04:39:51 +0100 |
commit | 6c01ebb87541ecf66d678606bb97d996bee51953 (patch) | |
tree | 6f81577d97c140b6981134ef257c719da89e36a4 /OpenSim/Region/ScriptEngine/Shared/Instance | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-6c01ebb87541ecf66d678606bb97d996bee51953.zip opensim-SC-6c01ebb87541ecf66d678606bb97d996bee51953.tar.gz opensim-SC-6c01ebb87541ecf66d678606bb97d996bee51953.tar.bz2 opensim-SC-6c01ebb87541ecf66d678606bb97d996bee51953.tar.xz |
Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region."
This reverts commit 2827deffe822378b6cb35dac6c90a21c3fbc0de7.
Pulling out a bad core commit that broke attachment teleporting for us
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 9548253..5288cd3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -391,22 +391,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
391 | } | 391 | } |
392 | else if (m_stateSource == StateSource.RegionStart) | 392 | else if (m_stateSource == StateSource.RegionStart) |
393 | { | 393 | { |
394 | //m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script"); | 394 | // m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script"); |
395 | PostEvent(new EventParams("changed", | 395 | PostEvent(new EventParams("changed", |
396 | new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION_RESTART) }, new DetectParams[0])); | 396 | new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION_RESTART) }, |
397 | new DetectParams[0])); | ||
397 | } | 398 | } |
398 | else if (m_stateSource == StateSource.PrimCrossing || m_stateSource == StateSource.Teleporting) | 399 | else if (m_stateSource == StateSource.PrimCrossing) |
399 | { | 400 | { |
400 | // CHANGED_REGION | 401 | // CHANGED_REGION |
401 | PostEvent(new EventParams("changed", | 402 | PostEvent(new EventParams("changed", |
402 | new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION) }, new DetectParams[0])); | 403 | new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION) }, |
403 | 404 | new DetectParams[0])); | |
404 | // CHANGED_TELEPORT | ||
405 | if (m_stateSource == StateSource.Teleporting) | ||
406 | PostEvent(new EventParams("changed", | ||
407 | new Object[] { new LSL_Types.LSLInteger((int)Changed.TELEPORT) }, new DetectParams[0])); | ||
408 | } | 405 | } |
409 | } | 406 | } |
410 | else | 407 | else |
411 | { | 408 | { |
412 | Start(); | 409 | Start(); |