From 901fdca13b8b6617ceabc4766c684799f4f8739b Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Wed, 27 May 2009 18:01:06 +0000 Subject: [PATCH] From: Chris Yeoh The attached patch implements llPassTouches. It has been added to the export/import XML along with the flag for AllowedInventoryDrop. The MySQL backend has been updated as well, though I haven't done one of those before so could do with a check. I added the migration mysql file as well. The other data backends need updating as well. --- OpenSim/Data/MySQL/MySQLRegionData.cs | 14 ++++++++++++-- OpenSim/Data/MySQL/Resources/029_RegionStore.sql | 5 +++++ .../Framework/Scenes/Scene.PacketHandlers.cs | 10 ++++++++-- .../Region/Framework/Scenes/SceneObjectPart.cs | 15 ++++++++++++++- .../Shared/Api/Implementation/LSL_Api.cs | 5 ++++- 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 OpenSim/Data/MySQL/Resources/029_RegionStore.sql diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index b13813fb33..8a24fec446 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs @@ -196,6 +196,7 @@ namespace OpenSim.Data.MySQL "ColorR, ColorG, ColorB, ColorA, "+ "ParticleSystem, ClickAction, Material, "+ "CollisionSound, CollisionSoundVolume, "+ + "PassTouches, "+ "LinkNumber) values (" + "?UUID, "+ "?CreationDate, ?Name, ?Text, "+ "?Description, ?SitName, ?TouchName, "+ @@ -227,7 +228,7 @@ namespace OpenSim.Data.MySQL "?SaleType, ?ColorR, ?ColorG, "+ "?ColorB, ?ColorA, ?ParticleSystem, "+ "?ClickAction, ?Material, ?CollisionSound, "+ - "?CollisionSoundVolume, ?LinkNumber)"; + "?CollisionSoundVolume, ?PassTouches, ?LinkNumber)"; FillPrimCommand(cmd, prim, obj.UUID, regionUUID); @@ -950,6 +951,9 @@ namespace OpenSim.Data.MySQL prim.CollisionSound = new UUID(row["CollisionSound"].ToString()); prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]); + + if (Convert.ToInt16(row["PassTouches"]) != 0) + prim.PassTouches = true; prim.LinkNum = Convert.ToInt32(row["LinkNumber"]); return prim; @@ -1272,6 +1276,12 @@ namespace OpenSim.Data.MySQL cmd.Parameters.AddWithValue("CollisionSound", prim.CollisionSound.ToString()); cmd.Parameters.AddWithValue("CollisionSoundVolume", prim.CollisionSoundVolume); + + if (prim.PassTouches) + cmd.Parameters.AddWithValue("PassTouches", 1); + else + cmd.Parameters.AddWithValue("PassTouches", 0); + cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); } @@ -1534,4 +1544,4 @@ namespace OpenSim.Data.MySQL } } } -} \ No newline at end of file +} diff --git a/OpenSim/Data/MySQL/Resources/029_RegionStore.sql b/OpenSim/Data/MySQL/Resources/029_RegionStore.sql new file mode 100644 index 0000000000..b5962a2e10 --- /dev/null +++ b/OpenSim/Data/MySQL/Resources/029_RegionStore.sql @@ -0,0 +1,5 @@ +BEGIN; + +ALTER TABLE prims ADD COLUMN PassTouches tinyint not null default 0; + +COMMIT; diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 4c99873e8e..8bf47e7507 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -251,10 +251,16 @@ 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); - else + // 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))) + { 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 9a455ae30a..719b028938 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -102,7 +102,6 @@ namespace OpenSim.Region.Framework.Scenes #region Fields - [XmlIgnore] public bool AllowedDrop = false; [XmlIgnore] @@ -216,6 +215,9 @@ namespace OpenSim.Region.Framework.Scenes private readonly UndoStack m_undo = new UndoStack(5); private UUID _creatorID; + + private bool m_passTouches = false; + /// /// Only used internally to schedule client updates. /// 0 - no update is scheduled @@ -431,6 +433,17 @@ 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; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index f932dbeafb..f4a944c631 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -3705,7 +3705,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llPassTouches(int pass) { m_host.AddScriptLPS(1); - NotImplemented("llPassTouches"); + if (pass != 0) + m_host.PassTouches = true; + else + m_host.PassTouches = false; } public LSL_String llRequestAgentData(string id, int data)