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/OSSL_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 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index d8b9159..aa878e6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1691,15 +1691,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1691 | { | 1691 | { |
1692 | CheckThreatLevel(ThreatLevel.Low, "osAvatarName2Key"); | 1692 | CheckThreatLevel(ThreatLevel.Low, "osAvatarName2Key"); |
1693 | 1693 | ||
1694 | CachedUserInfo userInfo = World.CommsManager.UserProfileCacheService.GetUserDetails(firstname, lastname); | 1694 | UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, firstname, lastname); |
1695 | 1695 | if (null == account) | |
1696 | if (null == userInfo) | ||
1697 | { | 1696 | { |
1698 | return UUID.Zero.ToString(); | 1697 | return UUID.Zero.ToString(); |
1699 | } | 1698 | } |
1700 | else | 1699 | else |
1701 | { | 1700 | { |
1702 | return userInfo.UserProfile.ID.ToString(); | 1701 | return account.PrincipalID.ToString(); |
1703 | } | 1702 | } |
1704 | } | 1703 | } |
1705 | 1704 | ||
@@ -1710,15 +1709,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1710 | 1709 | ||
1711 | if (UUID.TryParse(id, out key)) | 1710 | if (UUID.TryParse(id, out key)) |
1712 | { | 1711 | { |
1713 | CachedUserInfo userInfo = World.CommsManager.UserProfileCacheService.GetUserDetails(key); | 1712 | UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, key); |
1714 | 1713 | if (null == account) | |
1715 | if (null == userInfo) | ||
1716 | { | 1714 | { |
1717 | return ""; | 1715 | return ""; |
1718 | } | 1716 | } |
1719 | else | 1717 | else |
1720 | { | 1718 | { |
1721 | return userInfo.UserProfile.Name; | 1719 | return account.Name; |
1722 | } | 1720 | } |
1723 | } | 1721 | } |
1724 | else | 1722 | else |