aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/Assets
diff options
context:
space:
mode:
authorMW2007-03-30 11:09:51 +0000
committerMW2007-03-30 11:09:51 +0000
commit00579d3581cc2c16657fd64c488835b9630fefb5 (patch)
treec369a62a1c4eb10e4bee9377849f442aef991de0 /OpenSim.RegionServer/Assets
parentStarted to add a few features to the web front end that should be useful duri... (diff)
downloadopensim-SC_OLD-00579d3581cc2c16657fd64c488835b9630fefb5.zip
opensim-SC_OLD-00579d3581cc2c16657fd64c488835b9630fefb5.tar.gz
opensim-SC_OLD-00579d3581cc2c16657fd64c488835b9630fefb5.tar.bz2
opensim-SC_OLD-00579d3581cc2c16657fd64c488835b9630fefb5.tar.xz
Should now be able to create and edit Notecards
Diffstat (limited to 'OpenSim.RegionServer/Assets')
-rw-r--r--OpenSim.RegionServer/Assets/AssetCache.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs
index 244f562..196fb57 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -329,6 +329,7 @@ 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());
332 LLUUID requestID = new LLUUID(transferRequest.TransferInfo.Params, 0); 333 LLUUID requestID = new LLUUID(transferRequest.TransferInfo.Params, 0);
333 //check to see if asset is in local cache, if not we need to request it from asset server. 334 //check to see if asset is in local cache, if not we need to request it from asset server.
334 if (!this.Assets.ContainsKey(requestID)) 335 if (!this.Assets.ContainsKey(requestID))
@@ -337,6 +338,7 @@ namespace OpenSim.Assets
337 // so request from asset server 338 // so request from asset server
338 if (!this.RequestedAssets.ContainsKey(requestID)) 339 if (!this.RequestedAssets.ContainsKey(requestID))
339 { 340 {
341 Console.WriteLine("which isn't in our cache, so requesting from asset server");
340 AssetRequest request = new AssetRequest(); 342 AssetRequest request = new AssetRequest();
341 request.RequestUser = userInfo; 343 request.RequestUser = userInfo;
342 request.RequestAssetID = requestID; 344 request.RequestAssetID = requestID;
@@ -347,6 +349,7 @@ namespace OpenSim.Assets
347 return; 349 return;
348 } 350 }
349 //it is in our cache 351 //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];
351 354
352 //work out how many packets it should be sent in 355 //work out how many packets it should be sent in