* Use profile cache service for data snapshot
parent
e999c78600
commit
a29d7c9040
|
@ -29,6 +29,7 @@ using System;
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
|
using OpenSim.Framework.Communications.Cache;
|
||||||
using OpenSim.Region.DataSnapshot.Interfaces;
|
using OpenSim.Region.DataSnapshot.Interfaces;
|
||||||
using OpenSim.Region.Framework.Scenes;
|
using OpenSim.Region.Framework.Scenes;
|
||||||
|
|
||||||
|
@ -58,14 +59,15 @@ namespace OpenSim.Region.DataSnapshot.Providers
|
||||||
if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
|
if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
|
||||||
ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner;
|
ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner;
|
||||||
|
|
||||||
UserProfileData userProfile = m_scene.CommsManager.UserService.GetUserProfile(ownerid);
|
CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(ownerid);
|
||||||
|
|
||||||
//TODO: Change to query userserver about the master avatar UUID ?
|
//TODO: Change to query userserver about the master avatar UUID ?
|
||||||
String firstname;
|
String firstname;
|
||||||
String lastname;
|
String lastname;
|
||||||
|
|
||||||
if (userProfile != null)
|
if (userInfo != null)
|
||||||
{
|
{
|
||||||
|
UserProfileData userProfile = userInfo.UserProfile;
|
||||||
firstname = userProfile.FirstName;
|
firstname = userProfile.FirstName;
|
||||||
lastname = userProfile.SurName;
|
lastname = userProfile.SurName;
|
||||||
|
|
||||||
|
@ -109,10 +111,8 @@ namespace OpenSim.Region.DataSnapshot.Providers
|
||||||
publicaccess.Value = m_scene.RegionInfo.EstateSettings.PublicAccess.ToString();
|
publicaccess.Value = m_scene.RegionInfo.EstateSettings.PublicAccess.ToString();
|
||||||
flags.Attributes.Append(publicaccess);
|
flags.Attributes.Append(publicaccess);
|
||||||
|
|
||||||
|
|
||||||
estatedata.AppendChild(flags);
|
estatedata.AppendChild(flags);
|
||||||
|
|
||||||
|
|
||||||
this.Stale = false;
|
this.Stale = false;
|
||||||
return estatedata;
|
return estatedata;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue