diff options
author | Oren Hurvitz | 2013-10-24 17:40:55 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-03-24 18:18:08 +0100 |
commit | 305f5110c6d8c57ce2d4f9d0d052b564f3d1a4b9 (patch) | |
tree | 786a76c7c29ae308d55b9a70be76370c6ca0ec2d /OpenSim/Region/CoreModules/World | |
parent | During Load OAR, fix the User and Group ID's in objects that are embedded in ... (diff) | |
download | opensim-SC_OLD-305f5110c6d8c57ce2d4f9d0d052b564f3d1a4b9.zip opensim-SC_OLD-305f5110c6d8c57ce2d4f9d0d052b564f3d1a4b9.tar.gz opensim-SC_OLD-305f5110c6d8c57ce2d4f9d0d052b564f3d1a4b9.tar.bz2 opensim-SC_OLD-305f5110c6d8c57ce2d4f9d0d052b564f3d1a4b9.tar.xz |
In Load OAR: Zero isn't a valid Group ID
Resolves http://opensimulator.org/mantis/view.php?id=6943
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 6 |
1 files 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 | |||
189 | m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"] | 189 | m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"] |
190 | : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f); | 190 | : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f); |
191 | 191 | ||
192 | // Zero can never be a valid user id | 192 | // Zero can never be a valid user or group id |
193 | m_validUserUuids[UUID.Zero] = false; | 193 | m_validUserUuids[UUID.Zero] = false; |
194 | m_validGroupUuids[UUID.Zero] = false; | ||
194 | 195 | ||
195 | m_groupsModule = m_rootScene.RequestModuleInterface<IGroupsModule>(); | 196 | m_groupsModule = m_rootScene.RequestModuleInterface<IGroupsModule>(); |
196 | m_assetService = m_rootScene.AssetService; | 197 | m_assetService = m_rootScene.AssetService; |
@@ -705,9 +706,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
705 | /// <returns></returns> | 706 | /// <returns></returns> |
706 | private bool ResolveGroupUuid(UUID uuid) | 707 | private bool ResolveGroupUuid(UUID uuid) |
707 | { | 708 | { |
708 | if (uuid == UUID.Zero) | ||
709 | return true; // this means the object has no group | ||
710 | |||
711 | lock (m_validGroupUuids) | 709 | lock (m_validGroupUuids) |
712 | { | 710 | { |
713 | if (!m_validGroupUuids.ContainsKey(uuid)) | 711 | if (!m_validGroupUuids.ContainsKey(uuid)) |