diff options
| author | Diva Canto | 2009-12-11 08:11:26 -0800 |
|---|---|---|
| committer | Diva Canto | 2009-12-11 08:11:26 -0800 |
| commit | decd51f0811639169d63cb80fcc7dec931ea9530 (patch) | |
| tree | ff8865e36305ccf0ec02221606749847ffb66f12 /OpenSim/Framework | |
| parent | Refix the fix (diff) | |
| download | opensim-SC_OLD-decd51f0811639169d63cb80fcc7dec931ea9530.zip opensim-SC_OLD-decd51f0811639169d63cb80fcc7dec931ea9530.tar.gz opensim-SC_OLD-decd51f0811639169d63cb80fcc7dec931ea9530.tar.bz2 opensim-SC_OLD-decd51f0811639169d63cb80fcc7dec931ea9530.tar.xz | |
Attempt at fixing mantis #4411.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 16 |
1 files changed, 15 insertions, 1 deletions
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 | |||
| 139 | else | 139 | else |
| 140 | { | 140 | { |
| 141 | UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(fname, lname); | 141 | UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(fname, lname); |
| 142 | 142 | ||
| 143 | if (userProfile != null) | 143 | if (userProfile != null) |
| 144 | { | ||
| 145 | if (userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") | ||
| 146 | userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; | ||
| 147 | if (userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") | ||
| 148 | userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL; | ||
| 149 | |||
| 144 | return AddToCaches(userProfile); | 150 | return AddToCaches(userProfile); |
| 151 | } | ||
| 145 | else | 152 | else |
| 146 | return null; | 153 | return null; |
| 147 | } | 154 | } |
| @@ -169,7 +176,14 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 169 | { | 176 | { |
| 170 | UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID); | 177 | UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID); |
| 171 | if (userProfile != null) | 178 | if (userProfile != null) |
| 179 | { | ||
| 180 | if (userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") | ||
| 181 | userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; | ||
| 182 | if (userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") | ||
| 183 | userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL; | ||
| 184 | |||
| 172 | return AddToCaches(userProfile); | 185 | return AddToCaches(userProfile); |
| 186 | } | ||
| 173 | else | 187 | else |
| 174 | return null; | 188 | return null; |
| 175 | } | 189 | } |