From dfc553d0a4c25d6c1f491b228e89402c0415acda Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 15 Aug 2008 13:13:39 +0000
Subject: Fix up master avatar handling for estate owners. Introduces a new
 hierarchical rights structure. MasterAvatar: Owner of the region server (may
 be null), net gods (users with GodLevel 200), Estate owner (from database).
 Look at Opensim.ini.example to enable net gods. Estate owner will default to
 master avatar.

---
 OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs')

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 2b1a4ed..e6597c3 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -137,6 +137,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 // Try to retain the original creator/owner/lastowner if their uuid is present on this grid
                 // otherwise, use the master avatar uuid instead
                 LLUUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID;
+                if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
+                    masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner;
                 foreach (SceneObjectPart part in sceneObject.Children.Values)
                 {
                     if (!resolveUserUuid(part.CreatorID))
-- 
cgit v1.1