aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache
diff options
context:
space:
mode:
authorlbsa712009-04-13 20:04:18 +0000
committerlbsa712009-04-13 20:04:18 +0000
commit29355de6ee01b1f44f32ea45b9c06f636ae9a241 (patch)
tree677fb0c71117a6feaa5891f5c7ceacdd8d2069a6 /OpenSim/Framework/Communications/Cache
parent* Remove null reference exception in the J2KDecoderModule's J2K repair routin... (diff)
downloadopensim-SC_OLD-29355de6ee01b1f44f32ea45b9c06f636ae9a241.zip
opensim-SC_OLD-29355de6ee01b1f44f32ea45b9c06f636ae9a241.tar.gz
opensim-SC_OLD-29355de6ee01b1f44f32ea45b9c06f636ae9a241.tar.bz2
opensim-SC_OLD-29355de6ee01b1f44f32ea45b9c06f636ae9a241.tar.xz
* Some more experimental work on distributed assets. Nothing hotwired yet.
* Introduced preprocess step in FetchAsset (Might revert this later) * Some minor CCC * Added actual implementation of GetUserProfile( uri ) and the corresponding handler to OGS1. * Introduced non-functioning GetUserUri( userProfile) awaiting user server wireup (this might move elsewhere)
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index cbb2a5a..4d2db17 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -336,7 +336,7 @@ namespace OpenSim.Framework.Communications.Cache
336 { 336 {
337 AssetInfo assetInf = new AssetInfo(asset); 337 AssetInfo assetInf = new AssetInfo(asset);
338 338
339 ProcessReceivedAsset(IsTexture, assetInf); 339 ProcessReceivedAsset(IsTexture, assetInf, null);
340 340
341 if (!m_memcache.Contains(assetInf.FullID)) 341 if (!m_memcache.Contains(assetInf.FullID))
342 { 342 {
@@ -391,11 +391,11 @@ namespace OpenSim.Framework.Communications.Cache
391 } 391 }
392 } 392 }
393 393
394 protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf) 394 protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf, IUserService userService)
395 { 395 {
396 if(!IsTexture && assetInf.ContainsReferences && false ) 396 if(!IsTexture && assetInf.ContainsReferences && false )
397 { 397 {
398 assetInf.Data = ProcessAssetData(assetInf.Data); 398 assetInf.Data = ProcessAssetData(assetInf.Data, userService );
399 } 399 }
400 } 400 }
401 401
@@ -554,11 +554,11 @@ namespace OpenSim.Framework.Communications.Cache
554 } 554 }
555 } 555 }
556 556
557 public byte[] ProcessAssetData(byte[] assetData) 557 public byte[] ProcessAssetData(byte[] assetData, IUserService userService)
558 { 558 {
559 string data = Encoding.ASCII.GetString(assetData); 559 string data = Encoding.ASCII.GetString(assetData);
560 560
561 data = ProcessAssetDataString(data, null); 561 data = ProcessAssetDataString(data, userService );
562 562
563 return Encoding.ASCII.GetBytes( data ); 563 return Encoding.ASCII.GetBytes( data );
564 } 564 }