diff options
author | Justin Clarke Casey | 2009-04-17 18:06:40 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-17 18:06:40 +0000 |
commit | a29d7c904060595e14936ffae81640a418c2fa53 (patch) | |
tree | 7a10d24ab9123beb98a44d523b9edf41195ab068 | |
parent | * Also use the profile cache for osKey2Name() (diff) | |
download | opensim-SC_OLD-a29d7c904060595e14936ffae81640a418c2fa53.zip opensim-SC_OLD-a29d7c904060595e14936ffae81640a418c2fa53.tar.gz opensim-SC_OLD-a29d7c904060595e14936ffae81640a418c2fa53.tar.bz2 opensim-SC_OLD-a29d7c904060595e14936ffae81640a418c2fa53.tar.xz |
* Use profile cache service for data snapshot
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/DataSnapshot/EstateSnapshot.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs index 6865f49..cdc9344 100644 --- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs | |||
@@ -29,6 +29,7 @@ using System; | |||
29 | using System.Xml; | 29 | using System.Xml; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Communications.Cache; | ||
32 | using OpenSim.Region.DataSnapshot.Interfaces; | 33 | using OpenSim.Region.DataSnapshot.Interfaces; |
33 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
34 | 35 | ||
@@ -58,14 +59,15 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
58 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 59 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) |
59 | ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; | 60 | ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; |
60 | 61 | ||
61 | UserProfileData userProfile = m_scene.CommsManager.UserService.GetUserProfile(ownerid); | 62 | CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(ownerid); |
62 | 63 | ||
63 | //TODO: Change to query userserver about the master avatar UUID ? | 64 | //TODO: Change to query userserver about the master avatar UUID ? |
64 | String firstname; | 65 | String firstname; |
65 | String lastname; | 66 | String lastname; |
66 | 67 | ||
67 | if (userProfile != null) | 68 | if (userInfo != null) |
68 | { | 69 | { |
70 | UserProfileData userProfile = userInfo.UserProfile; | ||
69 | firstname = userProfile.FirstName; | 71 | firstname = userProfile.FirstName; |
70 | lastname = userProfile.SurName; | 72 | lastname = userProfile.SurName; |
71 | 73 | ||
@@ -109,10 +111,8 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
109 | publicaccess.Value = m_scene.RegionInfo.EstateSettings.PublicAccess.ToString(); | 111 | publicaccess.Value = m_scene.RegionInfo.EstateSettings.PublicAccess.ToString(); |
110 | flags.Attributes.Append(publicaccess); | 112 | flags.Attributes.Append(publicaccess); |
111 | 113 | ||
112 | |||
113 | estatedata.AppendChild(flags); | 114 | estatedata.AppendChild(flags); |
114 | 115 | ||
115 | |||
116 | this.Stale = false; | 116 | this.Stale = false; |
117 | return estatedata; | 117 | return estatedata; |
118 | } | 118 | } |