OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

In Load OAR, correctly restore group-owned objects 

Resolves http://opensimulator.org/mantis/view.php?id=6943
0.8.0.3
Oren Hurvitz 2014-01-12 12:07:30 +02:00
parent 305f5110c6
commit 1a32b35279
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -567,10 +567,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
if (UserManager != null) if (UserManager != null)
UserManager.AddUser(part.CreatorID, part.CreatorData); 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; 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; part.LastOwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
if (!ResolveGroupUuid(part.GroupID)) if (!ResolveGroupUuid(part.GroupID))
@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
TaskInventoryDictionary inv = part.TaskInventory; TaskInventoryDictionary inv = part.TaskInventory;
foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv) 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; kvp.Value.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
} }