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

* Properly guard against the possibility that CopyInventoryItem doesn't get an asset back from the cache

ThreadPoolClientBranch
Justin Clarke Casey 2008-02-20 23:31:33 +00:00
parent b0c5ef0b68
commit 0eeb56c61d
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,11 +317,22 @@ namespace OpenSim.Region.Environment.Scenes
}
}
AssetBase asset
= AssetCache.GetAsset(
item.assetID, (item.assetType == (int)AssetType.Texture ? true : false));
if (asset != null)
{
// TODO: preserve current permissions?
CreateNewInventoryItem(
remoteClient, newFolderID, callbackID,
AssetCache.GetAsset(item.assetID, (item.assetType == (int)AssetType.Texture ? true : false)),
item.inventoryNextPermissions);
remoteClient, newFolderID, callbackID, asset, item.inventoryNextPermissions);
}
else
{
m_log.ErrorFormat(
"[AGENT INVENTORY]: Could not copy item {0} since asset {1} could not be found",
item.inventoryName, item.assetID);
}
}
private AssetBase CreateAsset(string name, string description, sbyte invType, sbyte assetType, byte[] data)