ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed so Inventory structure is correct after a log out and re-login (in Sandbox accounts)

Browse Source
This commit is contained in:
MW
2007-03-29 17:04:24 +00:00
parent 546d9dfdc5
commit f673b73471
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim.RegionServer/Assets/InventoryCache.cs
View File

@@ -112,6 +112,19 @@ namespace OpenSim.Assets
return res;
}
public bool CreateNewInventoryFolder(SimClient remoteClient, LLUUID folderID, ushort type, string folderName, LLUUID parent)
{
bool res = false;
if (folderID != LLUUID.Zero) //don't create a folder with a zero id
{
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{
res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type, folderName, parent);
}
}
return res;
}
public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Assets.AssetBase asset)
{
LLUUID newItem = null;

9
OpenSim.RegionServer/SimClient.cs
View File

@@ -332,7 +332,7 @@ namespace OpenSim
break;
case PacketType.CreateInventoryFolder:
CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type);
m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Helpers.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
Console.WriteLine(Pack.ToString());
break;
case PacketType.CreateInventoryItem:
@@ -361,6 +361,7 @@ namespace OpenSim
AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));
if (asset != null)
{
Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");
m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset);
}
else
@@ -368,8 +369,13 @@ namespace OpenSim
asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
if (asset != null)
{
Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");
m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset);
}
else
{
Console.WriteLine("trying to update inventory item, but asset is null");
}
}
}
}
@@ -712,6 +718,7 @@ namespace OpenSim
if (this.m_userServer != null)
{
// a user server is set so request the inventory from it
Console.WriteLine("getting inventory from user server");
inventory = m_inventoryCache.FetchAgentsInventory(this.AgentID, m_userServer);
}
else