aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
-rw-r--r--OpenSim/Region/DataSnapshot/EstateSnapshot.cs9
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs5
2 files changed, 7 insertions, 7 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;
32using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Region.DataSnapshot.Interfaces; 33using OpenSim.Region.DataSnapshot.Interfaces;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Services.Interfaces;
35 36
36namespace OpenSim.Region.DataSnapshot.Providers 37namespace 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", "");
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 51eacef..141c05b 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -37,6 +37,7 @@ using OpenSim.Region.CoreModules.World.Land;
37using OpenSim.Region.DataSnapshot.Interfaces; 37using OpenSim.Region.DataSnapshot.Interfaces;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Services.Interfaces;
40 41
41namespace OpenSim.Region.DataSnapshot.Providers 42namespace OpenSim.Region.DataSnapshot.Providers
42{ 43{
@@ -258,8 +259,8 @@ namespace OpenSim.Region.DataSnapshot.Providers
258 try 259 try
259 { 260 {
260 XmlNode username = nodeFactory.CreateNode(XmlNodeType.Element, "name", ""); 261 XmlNode username = nodeFactory.CreateNode(XmlNodeType.Element, "name", "");
261 CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userOwnerUUID); 262 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, userOwnerUUID);
262 username.InnerText = profile.UserProfile.FirstName + " " + profile.UserProfile.SurName; 263 username.InnerText = account.FirstName + " " + account.LastName;
263 userblock.AppendChild(username); 264 userblock.AppendChild(username);
264 } 265 }
265 catch (Exception) 266 catch (Exception)