diff options
| author | Diva Canto | 2010-01-10 10:40:07 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-10 10:40:07 -0800 |
| commit | 1e1b2ab221851efc414678b7ea52ef2ca788ce9f (patch) | |
| tree | 29b6aa80e54a9c18529ae14e7d185fe67582d151 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
| parent | Add a "LockedOut" flag to allow locking a region out via the grid server. (diff) | |
| download | opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.zip opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.gz opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.bz2 opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.xz | |
* OMG! All but one references to UserProfileCacheService have been rerouted!
* HG is seriously broken here
* Compiles. Untested.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 2bfd3fb..876668c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -849,10 +849,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 849 | public string resolveName(UUID objecUUID) | 849 | public string resolveName(UUID objecUUID) |
| 850 | { | 850 | { |
| 851 | // try avatar username surname | 851 | // try avatar username surname |
| 852 | CachedUserInfo profile = World.CommsManager.UserProfileCacheService.GetUserDetails(objecUUID); | 852 | UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, objecUUID); |
| 853 | if (profile != null && profile.UserProfile != null) | 853 | if (account != null) |
| 854 | { | 854 | { |
| 855 | string avatarname = profile.UserProfile.FirstName + " " + profile.UserProfile.SurName; | 855 | string avatarname = account.Name; |
| 856 | return avatarname; | 856 | return avatarname; |
| 857 | } | 857 | } |
| 858 | // try an scene object | 858 | // try an scene object |