ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* OMG! All but one references to UserProfileCacheService have been rerouted!

Browse Source 
* HG is seriously broken here
* Compiles. Untested.
This commit is contained in:
Diva Canto
2010-01-10 10:40:07 -08:00
parent 78e9dc7c2c
commit 1e1b2ab221
34 changed files with 795 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/DataSnapshot/EstateSnapshot.cs
View File

@@ -32,6 +32,7 @@ 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
{
@@ -59,17 +60,15 @@ namespace OpenSim.Region.DataSnapshot.Providers
if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner;
CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(ownerid);
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", "");

5
OpenSim/Region/DataSnapshot/LandSnapshot.cs
View File

@@ -37,6 +37,7 @@ 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)