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

In Load OAR: Zero isn't a valid Group ID 

Resolves http://opensimulator.org/mantis/view.php?id=6943
0.8.0.3
Oren Hurvitz 2013-10-24 17:40:55 +03:00
parent 35078e03e5
commit 305f5110c6
1 changed files with 2 additions and 4 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

@ -189,8 +189,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"] m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"]
: new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f); : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f);
// Zero can never be a valid user id // Zero can never be a valid user or group id
m_validUserUuids[UUID.Zero] = false; m_validUserUuids[UUID.Zero] = false;
m_validGroupUuids[UUID.Zero] = false;
m_groupsModule = m_rootScene.RequestModuleInterface<IGroupsModule>(); m_groupsModule = m_rootScene.RequestModuleInterface<IGroupsModule>();
m_assetService = m_rootScene.AssetService; m_assetService = m_rootScene.AssetService;
@ -705,9 +706,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
/// <returns></returns> /// <returns></returns>
private bool ResolveGroupUuid(UUID uuid) private bool ResolveGroupUuid(UUID uuid)
{ {
if (uuid == UUID.Zero)
return true; // this means the object has no group
lock (m_validGroupUuids) lock (m_validGroupUuids)
{ {
if (!m_validGroupUuids.ContainsKey(uuid)) if (!m_validGroupUuids.ContainsKey(uuid))