From c28e8fcd67fb284930a0cc0e2f2ac5c8f7df3bc3 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 4 Oct 2008 15:54:21 +0000 Subject: Unclutter rezzing methods by removing the ad hoc permissions parameters. Thise were client supplied untrusted values we never used anyway. --- OpenSim/Framework/IClientAPI.cs | 4 +--- .../Region/ClientStack/LindenUDP/LLClientView.cs | 4 +--- OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 2 +- OpenSim/Region/Environment/Scenes/InnerScene.cs | 7 ++----- .../Region/Environment/Scenes/Scene.Inventory.cs | 23 +++++++--------------- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 +- 6 files changed, 13 insertions(+), 29 deletions(-) diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 3a5402c..5baa595 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -53,11 +53,9 @@ namespace OpenSim.Framework public delegate void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, - uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected, bool RemoveItem, UUID fromTaskID); - public delegate void RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt, - uint ItemFlags, uint NextOwnerMask); + public delegate void RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); public delegate void ObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot); diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index e3efb42..ef2b2ba 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -4135,8 +4135,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID, rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection, - rezPacket.RezData.EveryoneMask, rezPacket.RezData.GroupMask, - rezPacket.RezData.NextOwnerMask, rezPacket.RezData.ItemFlags, rezPacket.RezData.RezSelected, rezPacket.RezData.RemoveItem, rezPacket.RezData.FromTaskID); } @@ -4250,7 +4248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket)Pack; handlerRezSingleAttachment(this, rez.ObjectData.ItemID, - rez.ObjectData.AttachmentPt, rez.ObjectData.ItemFlags, rez.ObjectData.NextOwnerMask); + rez.ObjectData.AttachmentPt); } break; diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index f5ec6c7..49d9aec 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs @@ -82,7 +82,7 @@ namespace OpenSim.Region.DataSnapshot.Providers byte field, uint localId, uint mask, byte set) { this.Stale = true; }; client.OnRezObject += delegate(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, - uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected, + bool RezSelected, bool RemoveItem, UUID fromTaskID) { this.Stale = true; }; } diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 7ab0deb..f06b77f 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -452,13 +452,10 @@ namespace OpenSim.Region.Environment.Scenes } public SceneObjectGroup RezSingleAttachment( - IClientAPI remoteClient, UUID itemID, uint AttachmentPt,uint ItemFlags, uint NextOwnerMask) + IClientAPI remoteClient, UUID itemID, uint AttachmentPt) { SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient, itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, - (uint)(PermissionMask.Copy | PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer), - (uint)(PermissionMask.Copy | PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer), - (uint)(PermissionMask.Copy | PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer), - ItemFlags, false, false, remoteClient.AgentId, true); + false, false, remoteClient.AgentId, true); if (objatt != null) { diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 26f3e1d..2285b04 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1677,9 +1677,10 @@ namespace OpenSim.Region.Environment.Scenes { if (!grp.HasGroupChanged) { - m_log.InfoFormat("Detaching {0} which is unchanged", grp.UUID.ToString()); + m_log.InfoFormat("[ATTACHMENT] Detaching {0} which is unchanged", grp.UUID.ToString()); return; } + m_log.InfoFormat("[ATTACHMENT] Updating asset for attachment {0}, attachpoint {1}", grp.UUID.ToString(), grp.GetAttachmentPoint()); string sceneObjectXml = objectGroup.ToXmlString(); CachedUserInfo userInfo = @@ -1818,19 +1819,16 @@ namespace OpenSim.Region.Environment.Scenes /// /// /// - /// - /// /// /// /// public virtual void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, - uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected, bool RemoveItem, UUID fromTaskID) { RezObject( remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection, - EveryoneMask, GroupMask, NextOwnerMask, ItemFlags, RezSelected, RemoveItem, fromTaskID, false); + RezSelected, RemoveItem, fromTaskID, false); } /// @@ -1843,10 +1841,6 @@ namespace OpenSim.Region.Environment.Scenes /// /// /// - /// - /// - /// - /// /// /// /// @@ -1854,7 +1848,6 @@ namespace OpenSim.Region.Environment.Scenes /// public virtual SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, - uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) { // Work out position details @@ -2259,9 +2252,9 @@ namespace OpenSim.Region.Environment.Scenes } public void RezSingleAttachment(IClientAPI remoteClient, UUID itemID, - uint AttachmentPt, uint ItemFlags, uint NextOwnerMask) + uint AttachmentPt) { - SceneObjectGroup att = m_innerScene.RezSingleAttachment(remoteClient, itemID, AttachmentPt, ItemFlags, NextOwnerMask); + SceneObjectGroup att = m_innerScene.RezSingleAttachment(remoteClient, itemID, AttachmentPt); if (att == null) { @@ -2269,13 +2262,11 @@ namespace OpenSim.Region.Environment.Scenes return; } - RezSingleAttachment(att, remoteClient, itemID, AttachmentPt, - ItemFlags, NextOwnerMask); + RezSingleAttachment(att, remoteClient, itemID, AttachmentPt); } public void RezSingleAttachment(SceneObjectGroup att, - IClientAPI remoteClient, UUID itemID, uint AttachmentPt, - uint ItemFlags, uint NextOwnerMask) + IClientAPI remoteClient, UUID itemID, uint AttachmentPt) { if (att.RootPart != null) AttachmentPt = att.RootPart.AttachmentPoint; diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 4c0aa90..30f3e04 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -2958,7 +2958,7 @@ namespace OpenSim.Region.Environment.Scenes { // Rez from inventory m_scene.RezSingleAttachment(ControllingClient, itemID, - (uint)attachpoint, 0, 0); + (uint)attachpoint); } catch (Exception e) { -- cgit v1.1