Revert "From: Chris Yeoh <cyeoh@au1.ibm.com>"

This reverts r9666. for some reason the mysql update does not work.

2 files changed, 3 insertions, 22 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 8bf47e7..4c99873 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -251,16 +251,10 @@ namespace OpenSim.Region.Framework.Scenes
 
                             // If the touched prim handles touches, deliver it
                             // If not, deliver to root prim
-                            if ((part.ScriptEvents & scriptEvents.touch_start) != 0) 
+                            if ((part.ScriptEvents & scriptEvents.touch_start) != 0)
                                 EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg);
-                            // Deliver to the root prim if the touched prim doesn't handle touches
-                            // or if we're meant to pass on touches anyway. Don't send to root prim
-                            // if prim touched is the root prim as we just did it
-                            if (((part.ScriptEvents & scriptEvents.touch_start) == 0) ||
-                                (part.PassTouches && (part.LocalId != obj.RootPart.LocalId))) 
-                            {
+                            else
                                 EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg);
-                            }
 
                             return;
                         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 719b028..9a455ae 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -102,6 +102,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Fields
 
+        [XmlIgnore]
         public bool AllowedDrop = false;
 
         [XmlIgnore]
@@ -215,9 +216,6 @@ namespace OpenSim.Region.Framework.Scenes
         private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5);
         private UUID _creatorID;
 
-
-        private bool m_passTouches = false;
-
         /// <summary>
         /// Only used internally to schedule client updates.
         /// 0 - no update is scheduled
@@ -433,17 +431,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public bool PassTouches
-        {
-            get { return m_passTouches; }
-            set
-            {
-                m_passTouches = value;
-                if (ParentGroup != null)
-                    ParentGroup.HasGroupChanged = true;
-            }
-        }
-
         public ulong RegionHandle
         {
             get { return m_regionHandle; }