* Guard against a failure to find an inventory item in a move request by complaining in the log rather than terminating the session
parent
af825dae40
commit
00a38df75a
|
@ -969,12 +969,19 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
TaskInventoryItem taskItem = part.GetInventoryItem(itemId);
|
TaskInventoryItem taskItem = part.GetInventoryItem(itemId);
|
||||||
|
|
||||||
// Only owner can copy
|
if (null == taskItem)
|
||||||
if (remoteClient.AgentId != taskItem.OwnerID)
|
|
||||||
{
|
{
|
||||||
|
m_log.WarnFormat("[PRIM INVENTORY]: Move of inventory item {0} from prim with local id {1} failed"
|
||||||
|
+ " because the inventory item could not be found",
|
||||||
|
itemId, primLocalId);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only owner can copy
|
||||||
|
if (remoteClient.AgentId != taskItem.OwnerID)
|
||||||
|
return;
|
||||||
|
|
||||||
MoveTaskInventoryItem(remoteClient, folderId, part, itemId);
|
MoveTaskInventoryItem(remoteClient, folderId, part, itemId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue