1 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index a22f619..38db239 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -116,6 +116,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_merge = merge;
             m_skipAssets = skipAssets;
             m_requestId = requestId;
+
+            // Zero can never be a valid user id
+            m_validUserUuids[UUID.Zero] = false;
         }
 
         public ArchiveReadRequest(Scene scene, Stream loadStream, bool merge, bool skipAssets, Guid requestId)
@@ -125,6 +128,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_merge = merge;
             m_skipAssets = skipAssets;
             m_requestId = requestId;
+
+            // Zero can never be a valid user id
+            m_validUserUuids[UUID.Zero] = false;
         }
 
         /// <summary>
@@ -386,16 +392,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             if (!m_validUserUuids.ContainsKey(uuid))
             {
                 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid);
-                if (account != null)
-                    m_validUserUuids.Add(uuid, true);
-                else
-                    m_validUserUuids.Add(uuid, false);
+                m_validUserUuids.Add(uuid, account != null);
             }
 
-            if (m_validUserUuids[uuid])
-                return true;
-            else
-                return false;
+            return m_validUserUuids[uuid];
         }
 
         /// <summary>