* 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)
  

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
         {
             AssetInfo assetInf = new AssetInfo(asset);
 
-            ProcessReceivedAsset(IsTexture, assetInf);
+            ProcessReceivedAsset(IsTexture, assetInf, null);
 
             if (!m_memcache.Contains(assetInf.FullID))
             {
@@ -391,11 +391,11 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
 
-        protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf)
+        protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf, IUserService userService)
         {            
             if(!IsTexture && assetInf.ContainsReferences && false )
             {
-                assetInf.Data = ProcessAssetData(assetInf.Data);
+                assetInf.Data = ProcessAssetData(assetInf.Data, userService );
             }
         }
 
@@ -554,11 +554,11 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
 
-        public byte[] ProcessAssetData(byte[] assetData)
+        public byte[] ProcessAssetData(byte[] assetData, IUserService userService)
         {
             string data = Encoding.ASCII.GetString(assetData);
 
-            data = ProcessAssetDataString(data, null);
+            data = ProcessAssetDataString(data, userService );
 
             return Encoding.ASCII.GetBytes( data );
         }