diff options
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 29a9e14..acae4b1 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -142,6 +142,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
142 | 142 | ||
143 | if (userProfile != null) | 143 | if (userProfile != null) |
144 | { | 144 | { |
145 | |||
145 | if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null) | 146 | if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null) |
146 | userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; | 147 | userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; |
147 | if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null) | 148 | if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null) |
@@ -177,6 +178,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
177 | UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID); | 178 | UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID); |
178 | if (userProfile != null) | 179 | if (userProfile != null) |
179 | { | 180 | { |
181 | |||
180 | if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null) | 182 | if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null) |
181 | userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; | 183 | userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; |
182 | if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null) | 184 | if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null) |