mantis 8253: don't let attachments delete remove controls from viewers on crossings.

1 files changed, 1 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 059a846..018c2e2 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2288,13 +2288,6 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
 
-                    if(gotCrossUpdate)
-                    {
-                        if(IgnoredControls != ScriptControlled.CONTROL_ZERO)
-                            ControllingClient.SendTakeControls((int)IgnoredControls, false, true);
-                            
-                    }
-
                     m_log.DebugFormat("[CompleteMovement] attachments: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                     if (openChildAgents)
                     {
@@ -5685,7 +5678,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 IgnoredControls = ScriptControlled.CONTROL_ZERO;
                 obj.eventControls = (ScriptControlled)controls;
-                obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
             }
 
             lock (scriptedcontrols)
@@ -5801,7 +5793,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (scriptedcontrols.TryGetValue(Script_item_UUID, out takecontrols))
                 {
-                    ScriptControlled sctc = takecontrols.eventControls;
+                   ScriptControlled sctc = takecontrols.eventControls;
 
                     ControllingClient.SendTakeControls((int)sctc, false, false);
                     ControllingClient.SendTakeControls((int)sctc, true, false);