ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Remove all use of asset.InvType, as outlined in mailing list discussion

Browse Source 
* This is stage 1, the field will be removed from AssetType and the assets table if this change doesn't prove problematic
This commit is contained in:
Justin Clarke Casey
2008-06-23 18:01:58 +00:00
parent 8b6bd93d68
commit de24380233
9 changed files with 83 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
OpenSim/Framework/AgentInventory.cs
View File

@@ -157,31 +157,32 @@ namespace OpenSim.Framework
return true;
}
public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)
{
if (InventoryFolders.ContainsKey(folderID))
{
LLUUID NewItemID = LLUUID.Random();
InventoryItem Item = new InventoryItem();
Item.FolderID = folderID;
Item.OwnerID = AgentID;
Item.AssetID = asset.FullID;
Item.ItemID = NewItemID;
Item.Type = asset.Type;
Item.Name = asset.Name;
Item.Description = asset.Description;
Item.InvType = asset.InvType;
InventoryItems.Add(Item.ItemID, Item);
InventoryFolder Folder = InventoryFolders[Item.FolderID];
Folder.Items.Add(Item);
return (Item.ItemID);
}
else
{
return (null);
}
}
// FIXME: Unused, pending possible cleanup for this whole class.
// public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)
// {
// if (InventoryFolders.ContainsKey(folderID))
// {
// LLUUID NewItemID = LLUUID.Random();
//
// InventoryItem Item = new InventoryItem();
// Item.FolderID = folderID;
// Item.OwnerID = AgentID;
// Item.AssetID = asset.FullID;
// Item.ItemID = NewItemID;
// Item.Type = asset.Type;
// Item.Name = asset.Name;
// Item.Description = asset.Description;
// Item.InvType = asset.InvType;
// InventoryItems.Add(Item.ItemID, Item);
// InventoryFolder Folder = InventoryFolders[Item.FolderID];
// Folder.Items.Add(Item);
// return (Item.ItemID);
// }
// else
// {
// return (null);
// }
// }
public bool DeleteFromInventory(LLUUID itemID)
{
@@ -252,4 +253,4 @@ namespace OpenSim.Framework
return result;
}
}
}
}

2
OpenSim/Framework/AssetBase.cs
View File

@@ -106,4 +106,4 @@ namespace OpenSim.Framework
set { _temporary = value; }
}
}
}
}

3
OpenSim/Framework/AssetLandmark.cs
View File

@@ -42,7 +42,6 @@ namespace OpenSim.Framework
Data = a.Data;
FullID = a.FullID;
Type = a.Type;
InvType = a.InvType;
Name = a.Name;
Description = a.Description;
InternData();
@@ -58,4 +57,4 @@ namespace OpenSim.Framework
ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle);
}
}
}
}

2
OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
View File

@@ -137,13 +137,11 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
string name = source.Configs[i].GetString("name", String.Empty);
sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty));
AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false);
newAsset.Type = type;
newAsset.InvType = invType;
assets.Add(newAsset);
}
}