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/OptionalModules | |
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/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 3160cd3..648a5a4 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -40,6 +40,7 @@ using OpenSim.Framework.Communications.Cache; | |||
40 | using OpenSim.Framework.Servers.HttpServer; | 40 | using OpenSim.Framework.Servers.HttpServer; |
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | using OpenSim.Services.Interfaces; | ||
43 | 44 | ||
44 | namespace OpenSim.Region.OptionalModules.World.MoneyModule | 45 | namespace OpenSim.Region.OptionalModules.World.MoneyModule |
45 | { | 46 | { |
@@ -398,10 +399,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
398 | { | 399 | { |
399 | // try avatar username surname | 400 | // try avatar username surname |
400 | Scene scene = GetRandomScene(); | 401 | Scene scene = GetRandomScene(); |
401 | CachedUserInfo profile = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentID); | 402 | UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, agentID); |
402 | if (profile != null && profile.UserProfile != null) | 403 | if (account != null) |
403 | { | 404 | { |
404 | string avatarname = profile.UserProfile.FirstName + " " + profile.UserProfile.SurName; | 405 | string avatarname = account.FirstName + " " + account.LastName; |
405 | return avatarname; | 406 | return avatarname; |
406 | } | 407 | } |
407 | else | 408 | else |