From 305f5110c6d8c57ce2d4f9d0d052b564f3d1a4b9 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 24 Oct 2013 17:40:55 +0300
Subject: In Load OAR: Zero isn't a valid Group ID
Resolves http://opensimulator.org/mantis/view.php?id=6943
---
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 0c7be6f..f5707eb 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -189,8 +189,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"]
: 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_validGroupUuids[UUID.Zero] = false;
m_groupsModule = m_rootScene.RequestModuleInterface<IGroupsModule>();
m_assetService = m_rootScene.AssetService;
@@ -705,9 +706,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
/// <returns></returns>
private bool ResolveGroupUuid(UUID uuid)
{
- if (uuid == UUID.Zero)
- return true; // this means the object has no group
-
lock (m_validGroupUuids)
{
if (!m_validGroupUuids.ContainsKey(uuid))
--
cgit v1.1