aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorOren Hurvitz2014-01-12 12:07:30 +0200
committerOren Hurvitz2014-03-24 18:18:23 +0100
commit1a32b352791fe5dd3a344ab6797f6fd62e3e5391 (patch)
tree0266f480e053e1dd1379ab0202610d1edd2f916c /OpenSim
parentIn Load OAR: Zero isn't a valid Group ID (diff)
downloadopensim-SC_OLD-1a32b352791fe5dd3a344ab6797f6fd62e3e5391.zip
opensim-SC_OLD-1a32b352791fe5dd3a344ab6797f6fd62e3e5391.tar.gz
opensim-SC_OLD-1a32b352791fe5dd3a344ab6797f6fd62e3e5391.tar.bz2
opensim-SC_OLD-1a32b352791fe5dd3a344ab6797f6fd62e3e5391.tar.xz
In Load OAR, correctly restore group-owned objects
Resolves http://opensimulator.org/mantis/view.php?id=6943
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs6
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
567 if (UserManager != null) 567 if (UserManager != null)
568 UserManager.AddUser(part.CreatorID, part.CreatorData); 568 UserManager.AddUser(part.CreatorID, part.CreatorData);
569 569
570 if (!ResolveUserUuid(scene, part.OwnerID)) 570 if (!(ResolveUserUuid(scene, part.OwnerID) || ResolveGroupUuid(part.OwnerID)))
571 part.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner; 571 part.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
572 572
573 if (!ResolveUserUuid(scene, part.LastOwnerID)) 573 if (!(ResolveUserUuid(scene, part.LastOwnerID) || ResolveGroupUuid(part.LastOwnerID)))
574 part.LastOwnerID = scene.RegionInfo.EstateSettings.EstateOwner; 574 part.LastOwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
575 575
576 if (!ResolveGroupUuid(part.GroupID)) 576 if (!ResolveGroupUuid(part.GroupID))
@@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
588 TaskInventoryDictionary inv = part.TaskInventory; 588 TaskInventoryDictionary inv = part.TaskInventory;
589 foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv) 589 foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
590 { 590 {
591 if (!ResolveUserUuid(scene, kvp.Value.OwnerID)) 591 if (!(ResolveUserUuid(scene, kvp.Value.OwnerID) || ResolveGroupUuid(kvp.Value.OwnerID)))
592 { 592 {
593 kvp.Value.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner; 593 kvp.Value.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
594 } 594 }