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

4 files changed, 18 insertions, 7 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 );
         }
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 38c360a..3c09b40 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -50,6 +50,8 @@ namespace OpenSim.Framework.Communications
         
         UserProfileData GetUserProfile(Uri uri);
 
+        Uri GetUserUri(UserProfileData userProfile);
+
         UserAgentData GetAgentByUUID(UUID userId);
 
         void ClearUserAgent(UUID avatarID);
diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
index 3779f55..9d9810b 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
@@ -108,6 +108,11 @@ namespace OpenSim.Framework.Communications.Tests
                 return userProfile;
             }
 
+            public Uri GetUserUri(UserProfileData userProfile)
+            {
+                throw new NotImplementedException();
+            }
+
             public UserAgentData GetAgentByUUID(UUID userId)
             {
                 throw new NotImplementedException();
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index b7280d3..155f5cd 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.Communications
 
         public UserProfileData GetUserProfile(Uri uri)
         {
-            throw new System.NotImplementedException();
+            throw new NotImplementedException();
         }
 
         public UserAgentData GetAgentByUUID(UUID userId)
@@ -142,6 +142,11 @@ namespace OpenSim.Framework.Communications
             return null;
         }
 
+        public Uri GetUserUri(UserProfileData userProfile)
+        {
+            throw new NotImplementedException();
+        }
+
         // see IUserService
         public virtual UserProfileData GetUserProfile(UUID uuid)
         {
@@ -835,6 +840,5 @@ namespace OpenSim.Framework.Communications
         }
 
         #endregion
-
     }
 }