diff options
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index ea806ec..c810242 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -552,13 +552,22 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
552 | 552 | ||
553 | // Validate User and Group UUID's | 553 | // Validate User and Group UUID's |
554 | 554 | ||
555 | if (!ResolveUserUuid(scene, parcel.OwnerID)) | 555 | if (parcel.IsGroupOwned) |
556 | parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner; | ||
557 | |||
558 | if (!ResolveGroupUuid(parcel.GroupID)) | ||
559 | { | 556 | { |
560 | parcel.GroupID = UUID.Zero; | 557 | if (!ResolveGroupUuid(parcel.GroupID)) |
561 | parcel.IsGroupOwned = false; | 558 | { |
559 | parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner; | ||
560 | parcel.GroupID = UUID.Zero; | ||
561 | parcel.IsGroupOwned = false; | ||
562 | } | ||
563 | } | ||
564 | else | ||
565 | { | ||
566 | if (!ResolveUserUuid(scene, parcel.OwnerID)) | ||
567 | parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner; | ||
568 | |||
569 | if (!ResolveGroupUuid(parcel.GroupID)) | ||
570 | parcel.GroupID = UUID.Zero; | ||
562 | } | 571 | } |
563 | 572 | ||
564 | List<LandAccessEntry> accessList = new List<LandAccessEntry>(); | 573 | List<LandAccessEntry> accessList = new List<LandAccessEntry>(); |
@@ -571,8 +580,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
571 | parcel.ParcelAccessList = accessList; | 580 | parcel.ParcelAccessList = accessList; |
572 | 581 | ||
573 | // m_log.DebugFormat( | 582 | // m_log.DebugFormat( |
574 | // "[ARCHIVER]: Adding parcel {0}, local id {1}, area {2}", | 583 | // "[ARCHIVER]: Adding parcel {0}, local id {1}, owner {2}, group {3}, isGroupOwned {4}, area {5}", |
575 | // parcel.Name, parcel.LocalID, parcel.Area); | 584 | // parcel.Name, parcel.LocalID, parcel.OwnerID, parcel.GroupID, parcel.IsGroupOwned, parcel.Area); |
576 | 585 | ||
577 | landData.Add(parcel); | 586 | landData.Add(parcel); |
578 | } | 587 | } |