aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDr Scofield2009-05-25 11:32:31 +0000
committerDr Scofield2009-05-25 11:32:31 +0000
commitc18c1f6c7ce8fc17923b6ff847589191fd95c847 (patch)
tree569bc0093a66ad39dadf945b54e3a117b944e31c /OpenSim/Region/Framework
parentFrom: Chris Yeoh <cyeoh@au1.ibm.com> (diff)
downloadopensim-SC_OLD-c18c1f6c7ce8fc17923b6ff847589191fd95c847.zip
opensim-SC_OLD-c18c1f6c7ce8fc17923b6ff847589191fd95c847.tar.gz
opensim-SC_OLD-c18c1f6c7ce8fc17923b6ff847589191fd95c847.tar.bz2
opensim-SC_OLD-c18c1f6c7ce8fc17923b6ff847589191fd95c847.tar.xz
Revert "From: Chris Yeoh <cyeoh@au1.ibm.com>"
This reverts r9666. for some reason the mysql update does not work.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs15
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
251 251
252 // If the touched prim handles touches, deliver it 252 // If the touched prim handles touches, deliver it
253 // If not, deliver to root prim 253 // If not, deliver to root prim
254 if ((part.ScriptEvents & scriptEvents.touch_start) != 0) 254 if ((part.ScriptEvents & scriptEvents.touch_start) != 0)
255 EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg); 255 EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg);
256 // Deliver to the root prim if the touched prim doesn't handle touches 256 else
257 // or if we're meant to pass on touches anyway. Don't send to root prim
258 // if prim touched is the root prim as we just did it
259 if (((part.ScriptEvents & scriptEvents.touch_start) == 0) ||
260 (part.PassTouches && (part.LocalId != obj.RootPart.LocalId)))
261 {
262 EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg); 257 EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg);
263 }
264 258
265 return; 259 return;
266 } 260 }
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
102 102
103 #region Fields 103 #region Fields
104 104
105 [XmlIgnore]
105 public bool AllowedDrop = false; 106 public bool AllowedDrop = false;
106 107
107 [XmlIgnore] 108 [XmlIgnore]
@@ -215,9 +216,6 @@ namespace OpenSim.Region.Framework.Scenes
215 private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5); 216 private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5);
216 private UUID _creatorID; 217 private UUID _creatorID;
217 218
218
219 private bool m_passTouches = false;
220
221 /// <summary> 219 /// <summary>
222 /// Only used internally to schedule client updates. 220 /// Only used internally to schedule client updates.
223 /// 0 - no update is scheduled 221 /// 0 - no update is scheduled
@@ -433,17 +431,6 @@ namespace OpenSim.Region.Framework.Scenes
433 } 431 }
434 } 432 }
435 433
436 public bool PassTouches
437 {
438 get { return m_passTouches; }
439 set
440 {
441 m_passTouches = value;
442 if (ParentGroup != null)
443 ParentGroup.HasGroupChanged = true;
444 }
445 }
446
447 public ulong RegionHandle 434 public ulong RegionHandle
448 { 435 {
449 get { return m_regionHandle; } 436 get { return m_regionHandle; }