OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix to make [bad] tests happy.

0.6.8-post-fixes
Diva Canto 2009-12-11 08:28:24 -08:00 committed by Justin Clark-Casey (justincc)
parent fc374ada12
commit 52fd82ae5d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@ -142,9 +142,9 @@ namespace OpenSim.Framework.Communications.Cache
if (userProfile != null) if (userProfile != null)
{ {
if (userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null)
userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
if (userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null)
userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL; userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
return AddToCaches(userProfile); return AddToCaches(userProfile);
@ -177,9 +177,9 @@ namespace OpenSim.Framework.Communications.Cache
UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID); UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID);
if (userProfile != null) if (userProfile != null)
{ {
if (userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null)
userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
if (userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null)
userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL; userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
return AddToCaches(userProfile); return AddToCaches(userProfile);