* Remove dumb bug I put in which meant that an archive save would never complete if there were any missing assets

5 files changed, 17 insertions, 10 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index f780d1d..b937272 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -261,7 +261,7 @@ namespace OpenSim.Data.SQLite
                         shapeRow.Delete();
                     }
 
-                        RemoveItems(uuid);
+                    RemoveItems(uuid);
 
                     // Remove prim row
                     row.Delete();
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 5657b66..ef74b54 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -169,9 +169,6 @@ namespace OpenSim.Framework
             }
         }
 
-
-
-
         static PrimitiveBaseShape()
         {
             m_defaultTexture =
@@ -188,7 +185,11 @@ namespace OpenSim.Framework
         [XmlIgnore]
         public LLObject.TextureEntry Textures
         {
-            get { return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); }
+            get 
+            { 
+                //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
+                return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); 
+            }
 
             set { m_textureEntry = value.ToBytes(); }
         }
@@ -206,8 +207,6 @@ namespace OpenSim.Framework
             }
         }
 
-
-
         public static PrimitiveBaseShape Default
         {
             get
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 8236b6c..327808a 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         protected void GetSceneObjectAssetUuids(SceneObjectGroup sceneObject, IDictionary<LLUUID, int> assetUuids)
         {
             m_log.DebugFormat(
-                "[ARCHIVER]: Getting assets for object {0}, {1}", sceneObject.RootPart.Name, sceneObject.UUID);
+                "[ARCHIVER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
 
             foreach (SceneObjectPart part in sceneObject.GetParts())
             {
@@ -255,6 +255,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 catch (Exception e)
                 {
                     m_log.ErrorFormat("[ARCHIVER]: Failed to get part - {0}", e);
+                    m_log.DebugFormat("[ARCHIVER]: Texture entry length for prim was {0} (min is 46)", part.Shape.TextureEntry.Length);
                 }
             }
         }
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
index 2fd79b1..6ffbcbb 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
@@ -30,8 +30,10 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using System.Collections.Generic;
+//using System.Reflection;
 using System.Threading;
 using libsecondlife;
+//using log4net;
 
 namespace OpenSim.Region.Environment.Modules.World.Archiver
 {
@@ -40,6 +42,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
     /// </summary>
     class AssetsRequest
     {
+        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
         /// <summary>
         /// uuids to request
         /// </summary>
@@ -101,8 +105,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 m_assets[assetID] = asset;
             else
                 m_notFoundAssetUuids.Add(assetID);
+            
+            //m_log.DebugFormat(
+            //    "[ARCHIVER]: Received {0} assets and notification of {1} missing assets", m_assets.Count, m_notFoundAssetUuids.Count);
 
-            if (m_assets.Count == m_repliesRequired)
+            if (m_assets.Count + m_notFoundAssetUuids.Count == m_repliesRequired)
             {
                 // We want to stop using the asset cache thread asap as we now need to do the actual work of producing the archive
                 Thread newThread = new Thread(PerformAssetsRequestCallback);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index e982c35..23490fc 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -828,7 +828,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
                 catch (Exception e)
                 {
-                    m_log.Error("Failed to add scened object part", e);
+                    m_log.Error("Failed to add scene object part", e);
                 }
 
                 part.LinkNum = m_parts.Count;