Attempted fix for mantis issue# 66
parent
c28f505caa
commit
495cf040be
|
@ -167,14 +167,23 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
item = userInfo.RootFolder.HasItem(oldItemID);
|
if (userInfo.RootFolder != null)
|
||||||
if (item == null)
|
{
|
||||||
|
item = userInfo.RootFolder.HasItem(oldItemID);
|
||||||
|
if (item == null)
|
||||||
|
{
|
||||||
|
MainLog.Instance.Warn("INVENTORY", "Failed to find item " + oldItemID.ToString());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
MainLog.Instance.Warn("INVENTORY", "Failed to find item " + oldItemID.ToString());
|
MainLog.Instance.Warn("INVENTORY", "Failed to find item " + oldItemID.ToString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
AssetBase asset = AssetCache.CopyAsset(item.assetID);
|
AssetBase asset = AssetCache.CopyAsset(item.assetID);
|
||||||
if (asset == null)
|
if (asset == null)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue