aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-12-11 08:28:24 -0800
committerDiva Canto2009-12-11 08:28:24 -0800
commit5f0478c4c445cf049f8668bb82468fa30d783baf (patch)
treec118b6995671983ccdb69353b49cc4c4e58ce071
parentAttempt at fixing mantis #4411. (diff)
downloadopensim-SC_OLD-5f0478c4c445cf049f8668bb82468fa30d783baf.zip
opensim-SC_OLD-5f0478c4c445cf049f8668bb82468fa30d783baf.tar.gz
opensim-SC_OLD-5f0478c4c445cf049f8668bb82468fa30d783baf.tar.bz2
opensim-SC_OLD-5f0478c4c445cf049f8668bb82468fa30d783baf.tar.xz
Fix to make [bad] tests happy.
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index cebd571..29a9e14 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -142,9 +142,9 @@ namespace OpenSim.Framework.Communications.Cache
142 142
143 if (userProfile != null) 143 if (userProfile != null)
144 { 144 {
145 if (userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") 145 if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null)
146 userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; 146 userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
147 if (userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") 147 if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null)
148 userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL; 148 userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
149 149
150 return AddToCaches(userProfile); 150 return AddToCaches(userProfile);
@@ -177,9 +177,9 @@ namespace OpenSim.Framework.Communications.Cache
177 UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID); 177 UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID);
178 if (userProfile != null) 178 if (userProfile != null)
179 { 179 {
180 if (userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") 180 if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null)
181 userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; 181 userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
182 if (userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") 182 if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null)
183 userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL; 183 userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
184 184
185 return AddToCaches(userProfile); 185 return AddToCaches(userProfile);