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

2 files changed, 8 insertions, 12 deletions

diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index 8b7871b..0c99d8c 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -42,8 +42,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         NewRez = 1,
         PrimCrossing = 2,
         ScriptedRez = 3,
-        AttachedRez = 4,
-        Teleporting = 5
+        AttachedRez = 4
     }
 
     public interface IScriptWorkItem
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
                 }
                 else if (m_stateSource == StateSource.RegionStart)
                 {
-                    //m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script");
+//                    m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script");
                     PostEvent(new EventParams("changed",
-                        new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION_RESTART) }, new DetectParams[0]));
+                                              new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION_RESTART) },
+                                              new DetectParams[0]));
                 }
-                else if (m_stateSource == StateSource.PrimCrossing || m_stateSource == StateSource.Teleporting)
+                else if (m_stateSource == StateSource.PrimCrossing)
                 {
                     // CHANGED_REGION
                     PostEvent(new EventParams("changed",
-                        new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION) }, new DetectParams[0]));
-
-                    // CHANGED_TELEPORT
-                    if (m_stateSource == StateSource.Teleporting)
-                        PostEvent(new EventParams("changed",
-                            new Object[] { new LSL_Types.LSLInteger((int)Changed.TELEPORT) }, new DetectParams[0]));
+                                              new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION) },
+                                              new DetectParams[0]));
                 }
-            }
+            } 
             else 
             {
                 Start();