mirror of
https://github.com/opensim/opensim.git
synced 2026-08-07 17:55:48 +08:00
mantis 9036: do not allow attach of coalesced inventory assets
This commit is contained in:
@@ -322,6 +322,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
|
||||
if (item == null || item.AssetID.IsZero())
|
||||
return null;
|
||||
|
||||
if (attachment && (item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) != 0)
|
||||
{
|
||||
if (remoteClient != null && remoteClient.IsActive)
|
||||
remoteClient.SendAlertMessage("You can't attach multiple objects to one spot");
|
||||
return null;
|
||||
}
|
||||
|
||||
string userAssetServer;
|
||||
if (IsForeignUser(remoteClient.AgentId, out userAssetServer))
|
||||
{
|
||||
|
||||
@@ -926,6 +926,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
|
||||
if (item == null)
|
||||
return null;
|
||||
|
||||
if (attachment && (item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) != 0)
|
||||
{
|
||||
if (remoteClient != null && remoteClient.IsActive)
|
||||
remoteClient.SendAlertMessage("You can't attach multiple objects to one spot");
|
||||
return null;
|
||||
}
|
||||
|
||||
item.Owner = remoteClient.AgentId;
|
||||
|
||||
return RezObject(
|
||||
|
||||
Reference in New Issue
Block a user