aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/Assets/AssetCache.cs5
-rw-r--r--OpenSim.RegionServer/SimClient.cs6
2 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs
index 196fb57..1d5b286 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -329,7 +329,6 @@ namespace OpenSim.Assets
329 /// <param name="transferRequest"></param> 329 /// <param name="transferRequest"></param>
330 public void AddAssetRequest(SimClient userInfo, TransferRequestPacket transferRequest) 330 public void AddAssetRequest(SimClient userInfo, TransferRequestPacket transferRequest)
331 { 331 {
332 Console.WriteLine("AssetCache- got asset request: " + transferRequest.TransferInfo.TransferID.ToString());
333 LLUUID requestID = new LLUUID(transferRequest.TransferInfo.Params, 0); 332 LLUUID requestID = new LLUUID(transferRequest.TransferInfo.Params, 0);
334 //check to see if asset is in local cache, if not we need to request it from asset server. 333 //check to see if asset is in local cache, if not we need to request it from asset server.
335 if (!this.Assets.ContainsKey(requestID)) 334 if (!this.Assets.ContainsKey(requestID))
@@ -338,7 +337,6 @@ namespace OpenSim.Assets
338 // so request from asset server 337 // so request from asset server
339 if (!this.RequestedAssets.ContainsKey(requestID)) 338 if (!this.RequestedAssets.ContainsKey(requestID))
340 { 339 {
341 Console.WriteLine("which isn't in our cache, so requesting from asset server");
342 AssetRequest request = new AssetRequest(); 340 AssetRequest request = new AssetRequest();
343 request.RequestUser = userInfo; 341 request.RequestUser = userInfo;
344 request.RequestAssetID = requestID; 342 request.RequestAssetID = requestID;
@@ -349,8 +347,7 @@ namespace OpenSim.Assets
349 return; 347 return;
350 } 348 }
351 //it is in our cache 349 //it is in our cache
352 Console.WriteLine("which is in our cache so will be sending it"); 350 AssetInfo asset = this.Assets[requestID];
353 AssetInfo asset = this.Assets[requestID];
354 351
355 //work out how many packets it should be sent in 352 //work out how many packets it should be sent in
356 // and add to the AssetRequests list 353 // and add to the AssetRequests list
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 9411dac..0985447 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -357,7 +357,7 @@ namespace OpenSim
357 break; 357 break;
358 case PacketType.UpdateInventoryItem: 358 case PacketType.UpdateInventoryItem:
359 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; 359 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
360 Console.WriteLine(Pack.ToString()); 360 //Console.WriteLine(Pack.ToString());
361 for (int i = 0; i < update.InventoryData.Length; i++) 361 for (int i = 0; i < update.InventoryData.Length; i++)
362 { 362 {
363 if (update.InventoryData[i].TransactionID != LLUUID.Zero) 363 if (update.InventoryData[i].TransactionID != LLUUID.Zero)
@@ -744,7 +744,6 @@ namespace OpenSim
744 { 744 {
745 if (packet.InventoryBlock.Type == 7) 745 if (packet.InventoryBlock.Type == 7)
746 { 746 {
747 Console.WriteLine(packet.ToString());
748 this.debug = true; 747 this.debug = true;
749 //lets try this out with creating a notecard 748 //lets try this out with creating a notecard
750 AssetBase asset = new AssetBase(); 749 AssetBase asset = new AssetBase();
@@ -754,8 +753,7 @@ namespace OpenSim
754 asset.Type = packet.InventoryBlock.Type; 753 asset.Type = packet.InventoryBlock.Type;
755 asset.FullID = LLUUID.Random(); 754 asset.FullID = LLUUID.Random();
756 asset.Data = new byte[0]; 755 asset.Data = new byte[0];
757 Console.WriteLine("created new notecard with asset : " + asset.FullID.ToStringHyphenated()); 756
758
759 m_assetCache.AddAsset(asset); 757 m_assetCache.AddAsset(asset);
760 m_inventoryCache.AddNewInventoryItem(this, packet.InventoryBlock.FolderID, asset); 758 m_inventoryCache.AddNewInventoryItem(this, packet.InventoryBlock.FolderID, asset);
761 } 759 }