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

* Refactor: remove redundant userId parameter from UpdateItem() and DeleteItem() 

* Put warning in remove folder method about non implementation (not that this is used anyway - may be legacy)
0.6.0-stable
Justin Clarke Casey 2008-05-03 18:13:32 +00:00
parent f5609ba452
commit a5dfca8958
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
View File

@ -316,9 +316,9 @@ namespace OpenSim.Framework.Communications.Cache
/// </summary>
/// <param name="userID"></param>
/// <param name="itemInfo"></param>
public void UpdateItem(LLUUID userID, InventoryItemBase itemInfo)
public void UpdateItem(InventoryItemBase itemInfo)
{
if ((userID == UserProfile.ID) && HasInventory)
if (HasInventory)
{
m_commsManager.InventoryService.UpdateItem(itemInfo);
}
@ -330,10 +330,10 @@ namespace OpenSim.Framework.Communications.Cache
/// <param name="userID"></param>
/// <param name="item"></param>
/// <returns></returns>
public bool DeleteItem(LLUUID userID, InventoryItemBase item)
public bool DeleteItem(InventoryItemBase item)
{
bool result = false;
if ((userID == UserProfile.ID) && HasInventory)
if (HasInventory)
{
result = RootFolder.DeleteItem(item.ID);
if (result)

2
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
View File

@ -364,7 +364,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(Asset);
}
userInfo.UpdateItem(remoteClient.AgentId, item);
userInfo.UpdateItem(item);
}
}
}

21
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Scenes
AssetCache.AddAsset(asset);
item.AssetID = asset.FullID;
userInfo.UpdateItem(remoteClient.AgentId, item);
userInfo.UpdateItem(item);
// remoteClient.SendInventoryItemCreateUpdate(item);
if ((InventoryType) item.InvType == InventoryType.Notecard)
@ -294,7 +294,7 @@ namespace OpenSim.Region.Environment.Scenes
item.SaleType = itemUpd.SaleType;
item.Flags = itemUpd.Flags;
userInfo.UpdateItem(remoteClient.AgentId, item);
userInfo.UpdateItem(item);
}
else
{
@ -486,7 +486,7 @@ namespace OpenSim.Region.Environment.Scenes
item.Name = newName;
}
item.Folder = folderID;
userInfo.DeleteItem(remoteClient.AgentId, item);
userInfo.DeleteItem(item);
// TODO: preserve current permissions?
AddInventoryItem(remoteClient, item);
@ -630,11 +630,17 @@ namespace OpenSim.Region.Environment.Scenes
InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
if (item != null)
{
userInfo.DeleteItem(remoteClient.AgentId, item);
userInfo.DeleteItem(item);
}
}
}
/// <summary>
/// Removes an inventory folder. Although there is a packet in the Linden protocol for this, it may be
/// legacy and not currently used (purge folder is used to remove folders from trash instead).
/// </summary>
/// <param name="remoteClient"></param>
/// <param name="folderID"></param>
private void RemoveInventoryFolder(IClientAPI remoteClient, LLUUID folderID)
{
CachedUserInfo userInfo
@ -648,10 +654,15 @@ namespace OpenSim.Region.Environment.Scenes
if (userInfo.RootFolder != null)
{
InventoryItemBase folder = userInfo.RootFolder.HasItem(folderID);
if (folder != null)
{
m_log.WarnFormat(
"[AGENT INVENTORY]: Remove folder not implemented in request by {0} {1} for {2}",
remoteClient.Name, remoteClient.AgentId, folderID);
// doesn't work just yet, commented out. will fix in next patch.
// userInfo.DeleteItem(remoteClient.AgentId, folder);
// userInfo.DeleteItem(folder);
}
}
}