diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 54715a8..a1629fb 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -633,12 +633,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
633 | 633 | ||
634 | // Validate User and Group UUID's | 634 | // Validate User and Group UUID's |
635 | 635 | ||
636 | if (!ResolveGroupUuid(parcel.GroupID)) | ||
637 | parcel.GroupID = UUID.Zero; | ||
638 | |||
636 | if (parcel.IsGroupOwned) | 639 | if (parcel.IsGroupOwned) |
637 | { | 640 | { |
638 | if (!ResolveGroupUuid(parcel.GroupID)) | 641 | if (parcel.GroupID != UUID.Zero) |
642 | { | ||
643 | // In group-owned parcels, OwnerID=GroupID. This should already be the case, but let's make sure. | ||
644 | parcel.OwnerID = parcel.GroupID; | ||
645 | } | ||
646 | else | ||
639 | { | 647 | { |
640 | parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner; | 648 | parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner; |
641 | parcel.GroupID = UUID.Zero; | ||
642 | parcel.IsGroupOwned = false; | 649 | parcel.IsGroupOwned = false; |
643 | } | 650 | } |
644 | } | 651 | } |
@@ -646,9 +653,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
646 | { | 653 | { |
647 | if (!ResolveUserUuid(scene, parcel.OwnerID)) | 654 | if (!ResolveUserUuid(scene, parcel.OwnerID)) |
648 | parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner; | 655 | parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner; |
649 | |||
650 | if (!ResolveGroupUuid(parcel.GroupID)) | ||
651 | parcel.GroupID = UUID.Zero; | ||
652 | } | 656 | } |
653 | 657 | ||
654 | List<LandAccessEntry> accessList = new List<LandAccessEntry>(); | 658 | List<LandAccessEntry> accessList = new List<LandAccessEntry>(); |