OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2010-01-04 06:17:38 +00:00
parent 1121919b57 3740775472
commit d657b76dba
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -2056,6 +2056,13 @@ namespace OpenSim.Region.Framework.Scenes
group.Children.Count, remoteClient.AgentId, pos) group.Children.Count, remoteClient.AgentId, pos)
&& !attachment) && !attachment)
{ {
// The client operates in no fail mode. It will
// have already removed the item from the folder
// if it's no copy.
// Put it back if it's not an attachment
//
if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
remoteClient.SendBulkUpdateInventory(item);
return null; return null;
} }

2
OpenSim/Services/Interfaces/IInventoryService.cs
View File

@ -59,6 +59,7 @@ namespace OpenSim.Services.Interfaces
/// </summary> /// </summary>
/// <param name="userID"></param> /// <param name="userID"></param>
/// <returns></returns> /// <returns></returns>
[Obsolete]
InventoryCollection GetUserInventory(UUID userID); InventoryCollection GetUserInventory(UUID userID);
/// <summary> /// <summary>
@ -67,6 +68,7 @@ namespace OpenSim.Services.Interfaces
/// </summary> /// </summary>
/// <param name="userID"></param> /// <param name="userID"></param>
/// <param name="callback"></param> /// <param name="callback"></param>
[Obsolete]
void GetUserInventory(UUID userID, InventoryReceiptCallback callback); void GetUserInventory(UUID userID, InventoryReceiptCallback callback);
/// <summary> /// <summary>