From decd51f0811639169d63cb80fcc7dec931ea9530 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 11 Dec 2009 08:11:26 -0800
Subject: Attempt at fixing mantis #4411.

---
 .../Communications/Cache/UserProfileCacheService.cs      | 16 +++++++++++++++-
 .../ServiceConnectorsOut/Grid/HGGridConnector.cs         |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 9e12d948..cebd571 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -139,9 +139,16 @@ namespace OpenSim.Framework.Communications.Cache
                 else
                 {
                     UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(fname, lname);
-                
+
                     if (userProfile != null)
+                    {
+                        if (userProfile.UserAssetURI == null || userProfile.UserAssetURI == "")
+                            userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
+                        if (userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "")
+                            userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
+
                         return AddToCaches(userProfile);
+                    }
                     else
                         return null;
                 }
@@ -169,7 +176,14 @@ namespace OpenSim.Framework.Communications.Cache
                 {
                     UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID);
                     if (userProfile != null)
+                    {
+                        if (userProfile.UserAssetURI == null || userProfile.UserAssetURI == "")
+                            userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
+                        if (userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "")
+                            userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
+
                         return AddToCaches(userProfile);
+                    }
                     else
                         return null;
                 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index f2d8579..4d347cd 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene);
 
             // Yikes!! Remove this as soon as user services get refactored
-            LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.UserURL;
+            LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.AssetURL;
             LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL;
             LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL;
             HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI);
-- 
cgit v1.1