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/DataSnapshot/EstateSnapshot.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/DataSnapshot/EstateSnapshot.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs index 5fff89f..9206a6d 100644 --- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs | |||
@@ -32,6 +32,7 @@ using OpenSim.Framework; | |||
32 | using OpenSim.Framework.Communications.Cache; | 32 | using OpenSim.Framework.Communications.Cache; |
33 | using OpenSim.Region.DataSnapshot.Interfaces; | 33 | using OpenSim.Region.DataSnapshot.Interfaces; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | using OpenSim.Services.Interfaces; | ||
35 | 36 | ||
36 | namespace OpenSim.Region.DataSnapshot.Providers | 37 | namespace OpenSim.Region.DataSnapshot.Providers |
37 | { | 38 | { |
@@ -59,17 +60,15 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
59 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 60 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) |
60 | ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; | 61 | ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; |
61 | 62 | ||
62 | CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(ownerid); | 63 | UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); |
63 | |||
64 | //TODO: Change to query userserver about the master avatar UUID ? | 64 | //TODO: Change to query userserver about the master avatar UUID ? |
65 | String firstname; | 65 | String firstname; |
66 | String lastname; | 66 | String lastname; |
67 | 67 | ||
68 | if (userInfo != null) | 68 | if (userInfo != null) |
69 | { | 69 | { |
70 | UserProfileData userProfile = userInfo.UserProfile; | 70 | firstname = userInfo.FirstName; |
71 | firstname = userProfile.FirstName; | 71 | lastname = userInfo.LastName; |
72 | lastname = userProfile.SurName; | ||
73 | 72 | ||
74 | //TODO: Fix the marshalling system to have less copypasta gruntwork | 73 | //TODO: Fix the marshalling system to have less copypasta gruntwork |
75 | XmlNode user = factory.CreateNode(XmlNodeType.Element, "user", ""); | 74 | XmlNode user = factory.CreateNode(XmlNodeType.Element, "user", ""); |