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/Region/Environment/Scenes/InnerScene.cs | 7 ++-----
.../Region/Environment/Scenes/Scene.Inventory.cs | 23 +++++++---------------
OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 +-
3 files changed, 10 insertions(+), 22 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes')
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