From 1e1b2ab221851efc414678b7ea52ef2ca788ce9f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 10 Jan 2010 10:40:07 -0800
Subject: * OMG! All but one references to UserProfileCacheService have been
 rerouted! * HG is seriously broken here * Compiles. Untested.

---
 .../ServiceConnectorsOut/Asset/HGAssetBroker.cs        | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 0aa753d..044764b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -366,18 +366,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         public string GetUserAssetServer(UUID userID)
         {
-            CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
-            if ((uinfo != null) && (uinfo.UserProfile != null))
-            {
-                if ((uinfo.UserProfile.UserAssetURI == string.Empty) || (uinfo.UserProfile.UserAssetURI == ""))
-                    return m_LocalAssetServiceURI;
-                return uinfo.UserProfile.UserAssetURI.Trim('/');
-            }
-            else
-            {
-                // we don't know anyting about this user
-                return string.Empty;
-            }
+            UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, userID);
+
+            if (account != null && account.ServiceURLs.ContainsKey("AssetServerURI") && account.ServiceURLs["AssetServerURI"] != null)
+                return account.ServiceURLs["AssetServerURI"].ToString();
+
+            return string.Empty;
         }
 
         public string GetSimAssetServer()
-- 
cgit v1.1