3 files changed, 13 insertions, 27 deletions

diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 4df9094..6949d7c 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -101,21 +101,9 @@ namespace OpenSim.Region.DataSnapshot
                     try
                     {
                         m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
-                        if (config.Configs["Startup"].GetBoolean("gridmode", false))
-                        {
-                            m_gridinfo.Add(
-                                 "gridserverURL", 
-                                 config.Configs["Network"].GetString(
-                                     "grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()));
-                            m_gridinfo.Add(
-                                 "userserverURL", 
-                                 config.Configs["Network"].GetString(
-                                 "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()));
-                            m_gridinfo.Add(
-                                 "assetserverURL", 
-                                 config.Configs["Network"].GetString(
-                                 "asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString()));
-                        }
+                        IConfig conf = config.Configs["GridService"];
+                        if (conf != null)
+                            m_gridinfo.Add("gridserverURL", conf.GetString("GridServerURI", "http://127.0.0.1:8003"));
 
                         m_gridinfo.Add(
                             "Name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo"));
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index 5fff89f..8da9e8c 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -29,9 +29,10 @@ using System;
 using System.Xml;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.DataSnapshot.Providers
 {
@@ -55,21 +56,17 @@ namespace OpenSim.Region.DataSnapshot.Providers
             //Now in DataSnapshotProvider module form!
             XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", "");
 
-            UUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID;
-            if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
-                ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner;
-
-            CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(ownerid);
+            UUID ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner;
 
+            UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
             //TODO: Change to query userserver about the master avatar UUID ?
             String firstname;
             String lastname;
 
             if (userInfo != null)
             {
-                UserProfileData userProfile = userInfo.UserProfile;
-                firstname = userProfile.FirstName;
-                lastname = userProfile.SurName;
+                firstname = userInfo.FirstName;
+                lastname = userInfo.LastName;
 
                 //TODO: Fix the marshalling system to have less copypasta gruntwork
                 XmlNode user = factory.CreateNode(XmlNodeType.Element, "user", "");
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 51eacef..64d29f2 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -32,11 +32,12 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.DataSnapshot.Providers
 {
@@ -258,8 +259,8 @@ namespace OpenSim.Region.DataSnapshot.Providers
                             try
                             {
                                 XmlNode username = nodeFactory.CreateNode(XmlNodeType.Element, "name", "");
-                                CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userOwnerUUID);
-                                username.InnerText = profile.UserProfile.FirstName + " " + profile.UserProfile.SurName;
+                                UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, userOwnerUUID);
+                                username.InnerText = account.FirstName + " " + account.LastName;
                                 userblock.AppendChild(username);
                             }
                             catch (Exception)