diff options
Diffstat (limited to 'OpenSim.RegionServer/SimClient.cs')
-rw-r--r-- | OpenSim.RegionServer/SimClient.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index 6eb48fb..068e148 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs | |||
@@ -332,7 +332,7 @@ namespace OpenSim | |||
332 | break; | 332 | break; |
333 | case PacketType.CreateInventoryFolder: | 333 | case PacketType.CreateInventoryFolder: |
334 | CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; | 334 | CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; |
335 | m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type); | 335 | m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Helpers.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID); |
336 | Console.WriteLine(Pack.ToString()); | 336 | Console.WriteLine(Pack.ToString()); |
337 | break; | 337 | break; |
338 | case PacketType.CreateInventoryItem: | 338 | case PacketType.CreateInventoryItem: |
@@ -361,6 +361,7 @@ namespace OpenSim | |||
361 | AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); | 361 | AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); |
362 | if (asset != null) | 362 | if (asset != null) |
363 | { | 363 | { |
364 | Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache"); | ||
364 | m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); | 365 | m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); |
365 | } | 366 | } |
366 | else | 367 | else |
@@ -368,8 +369,13 @@ namespace OpenSim | |||
368 | asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); | 369 | asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); |
369 | if (asset != null) | 370 | if (asset != null) |
370 | { | 371 | { |
372 | Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache"); | ||
371 | m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); | 373 | m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); |
372 | } | 374 | } |
375 | else | ||
376 | { | ||
377 | Console.WriteLine("trying to update inventory item, but asset is null"); | ||
378 | } | ||
373 | } | 379 | } |
374 | } | 380 | } |
375 | } | 381 | } |
@@ -712,6 +718,7 @@ namespace OpenSim | |||
712 | if (this.m_userServer != null) | 718 | if (this.m_userServer != null) |
713 | { | 719 | { |
714 | // a user server is set so request the inventory from it | 720 | // a user server is set so request the inventory from it |
721 | Console.WriteLine("getting inventory from user server"); | ||
715 | inventory = m_inventoryCache.FetchAgentsInventory(this.AgentID, m_userServer); | 722 | inventory = m_inventoryCache.FetchAgentsInventory(this.AgentID, m_userServer); |
716 | } | 723 | } |
717 | else | 724 | else |