2 files changed, 37 insertions, 8 deletions

diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs
index f7f2e10..4149cb2 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -145,15 +145,12 @@ namespace OpenSim.Assets
                 num = 5;

             }

             AssetRequest req;

-            Console.WriteLine("processing texture requests ( " + num + " )");

             for (int i = 0; i < num; i++)

             {

                 req = (AssetRequest)this.TextureRequests[i];

                 if (req.PacketCounter != req.NumPackets)

                 {

-                    // if (req.ImageInfo.FullID == new LLUUID("00000000-0000-0000-5005-000000000005"))

-                    Console.WriteLine("sending base texture ( " + req.ImageInfo.FullID + " ) in " + req.NumPackets + "number of packets");

-

+                     

                     if (req.PacketCounter == 0)

                     {

                         //first time for this request so send imagedata packet

@@ -227,7 +224,6 @@ namespace OpenSim.Assets
         }

         public void AssetReceived(AssetBase asset, bool IsTexture)

         {

-            Console.WriteLine("received asset from asset server ( " + asset.FullID + " )");

             if (asset.FullID != LLUUID.Zero)  // if it is set to zero then the asset wasn't found by the server

             {

                 //check if it is a texture or not

@@ -433,9 +429,6 @@ namespace OpenSim.Assets
         /// <param name="imageID"></param>

         public void AddTextureRequest(SimClient userInfo, LLUUID imageID)

         {

-            if (imageID == new LLUUID("00000000-0000-0000-5005-000000000005"))

-                Console.WriteLine("request base prim texture ");

-

             //check to see if texture is in local cache, if not request from asset server

             if (!this.Textures.ContainsKey(imageID))

             {

diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs
index 0788db2..e4d0a90 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim.RegionServer/Assets/InventoryCache.cs
@@ -84,6 +84,11 @@ namespace OpenSim.Assets
             if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

             {

                 newItem = this._agentsInventory[remoteClient.AgentID].AddToInventory(folderID, asset);

+                if (newItem != null)

+                {

+                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[newItem];

+                    this.SendItemUpdateCreate(remoteClient, Item);

+                }

             }

 

             return newItem;

@@ -185,6 +190,37 @@ namespace OpenSim.Assets
                 }

             }

         }

+        private void SendItemUpdateCreate(SimClient remoteClient, InventoryItem Item)

+        {

+

+            UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();

+            InventoryReply.AgentData.AgentID = remoteClient.AgentID;

+            InventoryReply.AgentData.SimApproved = true;

+            InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];

+            InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();

+            InventoryReply.InventoryData[0].ItemID = Item.ItemID;

+            InventoryReply.InventoryData[0].AssetID = Item.AssetID;

+            InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;

+            InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;

+            InventoryReply.InventoryData[0].CreationDate = 1000;

+            InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");

+            InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;

+            InventoryReply.InventoryData[0].Flags = 1;

+            InventoryReply.InventoryData[0].FolderID = Item.FolderID;

+            InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");

+            InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;

+            InventoryReply.InventoryData[0].InvType = Item.InvType;

+            InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");

+            InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;

+            InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;

+            InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;

+            InventoryReply.InventoryData[0].SalePrice = 100;

+            InventoryReply.InventoryData[0].SaleType = 0;

+            InventoryReply.InventoryData[0].Type = Item.Type;

+            InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);

+

+            remoteClient.OutPacket(InventoryReply);

+        }

     }