diff options
| author | Melanie | 2010-01-10 22:41:42 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-10 22:41:42 +0000 |
| commit | 3c90d834eac382af5edf091e83aea1ffcce91792 (patch) | |
| tree | 60662b0f13fab4e0d7a7ab93533e5e66edbecf68 /OpenSim/Region/DataSnapshot | |
| parent | * Last reference to CommsManager.UserProfileCacheService removed (diff) | |
| download | opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.zip opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.tar.gz opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.tar.bz2 opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.tar.xz | |
Remove all references to master avatar, replacing with estate owner where
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/EstateSnapshot.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs index 9206a6d..27c82cd 100644 --- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs | |||
| @@ -56,9 +56,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
| 56 | //Now in DataSnapshotProvider module form! | 56 | //Now in DataSnapshotProvider module form! |
| 57 | XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", ""); | 57 | XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", ""); |
| 58 | 58 | ||
| 59 | UUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 59 | ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; |
| 60 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | ||
| 61 | ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
| 62 | 60 | ||
| 63 | UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); | 61 | UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); |
| 64 | //TODO: Change to query userserver about the master avatar UUID ? | 62 | //TODO: Change to query userserver about the master avatar UUID ? |