In Load OAR, correctly restore group-owned objects

Resolves http://opensimulator.org/mantis/view.php?id=6943

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index f5707eb..7920748 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -567,10 +567,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 if (UserManager != null)
                     UserManager.AddUser(part.CreatorID, part.CreatorData);
 
-                if (!ResolveUserUuid(scene, part.OwnerID))
+                if (!(ResolveUserUuid(scene, part.OwnerID) || ResolveGroupUuid(part.OwnerID)))
                     part.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
 
-                if (!ResolveUserUuid(scene, part.LastOwnerID))
+                if (!(ResolveUserUuid(scene, part.LastOwnerID) || ResolveGroupUuid(part.LastOwnerID)))
                     part.LastOwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
 
                 if (!ResolveGroupUuid(part.GroupID))
@@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     TaskInventoryDictionary inv = part.TaskInventory;
                     foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
                     {
-                        if (!ResolveUserUuid(scene, kvp.Value.OwnerID))
+                        if (!(ResolveUserUuid(scene, kvp.Value.OwnerID) || ResolveGroupUuid(kvp.Value.OwnerID)))
                         {
                             kvp.Value.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
                         }