diff options
| author | Justin Clarke Casey | 2009-04-17 17:33:31 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2009-04-17 17:33:31 +0000 |
| commit | e999c78600c0d1f0ad122987c8ded62251ceb049 (patch) | |
| tree | 2f033035cd350c0bba120b0cf10fe50889740204 /OpenSim/Region | |
| parent | * Use cached user profiles in osAvatarName2Key() (diff) | |
| download | opensim-SC-e999c78600c0d1f0ad122987c8ded62251ceb049.zip opensim-SC-e999c78600c0d1f0ad122987c8ded62251ceb049.tar.gz opensim-SC-e999c78600c0d1f0ad122987c8ded62251ceb049.tar.bz2 opensim-SC-e999c78600c0d1f0ad122987c8ded62251ceb049.tar.xz | |
* Also use the profile cache for osKey2Name()
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 0cfa61d..30e457e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -1368,15 +1368,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1368 | 1368 | ||
| 1369 | if (UUID.TryParse(id, out key)) | 1369 | if (UUID.TryParse(id, out key)) |
| 1370 | { | 1370 | { |
| 1371 | UserProfileData UserProfile = World.CommsManager.UserService | 1371 | CachedUserInfo userInfo = World.CommsManager.UserProfileCacheService.GetUserDetails(key); |
| 1372 | .GetUserProfile(key); | 1372 | |
| 1373 | if (UserProfile==null) | 1373 | if (null == userInfo) |
| 1374 | { | 1374 | { |
| 1375 | return ""; | 1375 | return ""; |
| 1376 | } | 1376 | } |
| 1377 | else | 1377 | else |
| 1378 | { | 1378 | { |
| 1379 | return UserProfile.Name; | 1379 | return userInfo.UserProfile.Name; |
| 1380 | } | 1380 | } |
| 1381 | } | 1381 | } |
| 1382 | else | 1382 | else |