Unclutter rezzing methods by removing the ad hoc permissions parameters.
Thise were client supplied untrusted values we never used anyway.0.6.0-stable
parent
6bf521c7df
commit
c28e8fcd67
|
@ -53,11 +53,9 @@ namespace OpenSim.Framework
|
||||||
|
|
||||||
public delegate void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
|
public delegate void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
|
||||||
UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
|
UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
|
||||||
uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,
|
|
||||||
bool RezSelected, bool RemoveItem, UUID fromTaskID);
|
bool RezSelected, bool RemoveItem, UUID fromTaskID);
|
||||||
|
|
||||||
public delegate void RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt,
|
public delegate void RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
|
||||||
uint ItemFlags, uint NextOwnerMask);
|
|
||||||
|
|
||||||
public delegate void ObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot);
|
public delegate void ObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot);
|
||||||
|
|
||||||
|
|
|
@ -4135,8 +4135,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd,
|
handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd,
|
||||||
rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID,
|
rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID,
|
||||||
rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection,
|
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.RezSelected, rezPacket.RezData.RemoveItem,
|
||||||
rezPacket.RezData.FromTaskID);
|
rezPacket.RezData.FromTaskID);
|
||||||
}
|
}
|
||||||
|
@ -4250,7 +4248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
{
|
{
|
||||||
RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket)Pack;
|
RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket)Pack;
|
||||||
handlerRezSingleAttachment(this, rez.ObjectData.ItemID,
|
handlerRezSingleAttachment(this, rez.ObjectData.ItemID,
|
||||||
rez.ObjectData.AttachmentPt, rez.ObjectData.ItemFlags, rez.ObjectData.NextOwnerMask);
|
rez.ObjectData.AttachmentPt);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -82,7 +82,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
|
||||||
byte field, uint localId, uint mask, byte set) { this.Stale = true; };
|
byte field, uint localId, uint mask, byte set) { this.Stale = true; };
|
||||||
client.OnRezObject += delegate(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd,
|
client.OnRezObject += delegate(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd,
|
||||||
Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
|
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; };
|
bool RemoveItem, UUID fromTaskID) { this.Stale = true; };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -452,13 +452,10 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
}
|
}
|
||||||
|
|
||||||
public SceneObjectGroup RezSingleAttachment(
|
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,
|
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),
|
false, false, remoteClient.AgentId, true);
|
||||||
(uint)(PermissionMask.Copy | PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer),
|
|
||||||
(uint)(PermissionMask.Copy | PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer),
|
|
||||||
ItemFlags, false, false, remoteClient.AgentId, true);
|
|
||||||
|
|
||||||
if (objatt != null)
|
if (objatt != null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1677,9 +1677,10 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
{
|
{
|
||||||
if (!grp.HasGroupChanged)
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
m_log.InfoFormat("[ATTACHMENT] Updating asset for attachment {0}, attachpoint {1}", grp.UUID.ToString(), grp.GetAttachmentPoint());
|
||||||
string sceneObjectXml = objectGroup.ToXmlString();
|
string sceneObjectXml = objectGroup.ToXmlString();
|
||||||
|
|
||||||
CachedUserInfo userInfo =
|
CachedUserInfo userInfo =
|
||||||
|
@ -1818,19 +1819,16 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
/// <param name="RayEndIsIntersection"></param>
|
/// <param name="RayEndIsIntersection"></param>
|
||||||
/// <param name="EveryoneMask"></param>
|
/// <param name="EveryoneMask"></param>
|
||||||
/// <param name="GroupMask"></param>
|
/// <param name="GroupMask"></param>
|
||||||
/// <param name="NextOwnerMask"></param>
|
|
||||||
/// <param name="ItemFlags"></param>
|
|
||||||
/// <param name="RezSelected"></param>
|
/// <param name="RezSelected"></param>
|
||||||
/// <param name="RemoveItem"></param>
|
/// <param name="RemoveItem"></param>
|
||||||
/// <param name="fromTaskID"></param>
|
/// <param name="fromTaskID"></param>
|
||||||
public virtual void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
|
public virtual void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
|
||||||
UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
|
UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
|
||||||
uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,
|
|
||||||
bool RezSelected, bool RemoveItem, UUID fromTaskID)
|
bool RezSelected, bool RemoveItem, UUID fromTaskID)
|
||||||
{
|
{
|
||||||
RezObject(
|
RezObject(
|
||||||
remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
|
remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
|
||||||
EveryoneMask, GroupMask, NextOwnerMask, ItemFlags, RezSelected, RemoveItem, fromTaskID, false);
|
RezSelected, RemoveItem, fromTaskID, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -1843,10 +1841,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
/// <param name="RayTargetID"></param>
|
/// <param name="RayTargetID"></param>
|
||||||
/// <param name="BypassRayCast"></param>
|
/// <param name="BypassRayCast"></param>
|
||||||
/// <param name="RayEndIsIntersection"></param>
|
/// <param name="RayEndIsIntersection"></param>
|
||||||
/// <param name="EveryoneMask"></param>
|
|
||||||
/// <param name="GroupMask"></param>
|
|
||||||
/// <param name="NextOwnerMask"></param>
|
|
||||||
/// <param name="ItemFlags"></param>
|
|
||||||
/// <param name="RezSelected"></param>
|
/// <param name="RezSelected"></param>
|
||||||
/// <param name="RemoveItem"></param>
|
/// <param name="RemoveItem"></param>
|
||||||
/// <param name="fromTaskID"></param>
|
/// <param name="fromTaskID"></param>
|
||||||
|
@ -1854,7 +1848,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public virtual SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
|
public virtual SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
|
||||||
UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
|
UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
|
||||||
uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,
|
|
||||||
bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
|
bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
|
||||||
{
|
{
|
||||||
// Work out position details
|
// Work out position details
|
||||||
|
@ -2259,9 +2252,9 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RezSingleAttachment(IClientAPI remoteClient, UUID itemID,
|
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)
|
if (att == null)
|
||||||
{
|
{
|
||||||
|
@ -2269,13 +2262,11 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RezSingleAttachment(att, remoteClient, itemID, AttachmentPt,
|
RezSingleAttachment(att, remoteClient, itemID, AttachmentPt);
|
||||||
ItemFlags, NextOwnerMask);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RezSingleAttachment(SceneObjectGroup att,
|
public void RezSingleAttachment(SceneObjectGroup att,
|
||||||
IClientAPI remoteClient, UUID itemID, uint AttachmentPt,
|
IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
|
||||||
uint ItemFlags, uint NextOwnerMask)
|
|
||||||
{
|
{
|
||||||
if (att.RootPart != null)
|
if (att.RootPart != null)
|
||||||
AttachmentPt = att.RootPart.AttachmentPoint;
|
AttachmentPt = att.RootPart.AttachmentPoint;
|
||||||
|
|
|
@ -2958,7 +2958,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
{
|
{
|
||||||
// Rez from inventory
|
// Rez from inventory
|
||||||
m_scene.RezSingleAttachment(ControllingClient, itemID,
|
m_scene.RezSingleAttachment(ControllingClient, itemID,
|
||||||
(uint)attachpoint, 0, 0);
|
(uint)attachpoint);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue