* On archive loading, tell the user how many objects we are ignoring because they already exist in the scene

* (ability to give objects new uuids will come later)

2 files changed, 13 insertions, 9 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 6a2b2d9..abd3387 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -196,7 +196,10 @@ namespace OpenSim.Region.Environment.Scenes
         /// If true, changes to the object will be reflected in its persisted data
         /// If false, the persisted data will not be changed even if the object in the scene is changed
         /// </param>
-        protected internal void AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
+        /// <returns>
+        /// true if the object was added, false if an object with the same uuid was already in the scene
+        /// </returns>         
+        protected internal bool AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
         {
             sceneObject.RegionHandle = m_regInfo.RegionHandle;
             sceneObject.SetScene(m_parentScene);
@@ -208,7 +211,7 @@ namespace OpenSim.Region.Environment.Scenes
             
             sceneObject.UpdateParentIDs();
 
-            AddSceneObject(sceneObject, attachToBackup);
+            return AddSceneObject(sceneObject, attachToBackup);
         }
         
         /// <summary>
@@ -220,14 +223,15 @@ namespace OpenSim.Region.Environment.Scenes
         /// If true, the object is made persistent into the scene.
         /// If false, the object will not persist over server restarts
         /// </param>
-        /// <returns>true if the object was added, false if an object with the same uuid was already in the scene
+        /// <returns>
+        /// true if the object was added, false if an object with the same uuid was already in the scene
         /// </returns>        
-        protected internal void AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
+        protected internal bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
         {   
             // Ensure that we persist this new scene object
             sceneObject.HasGroupChanged = true;
             
-            AddSceneObject(sceneObject, attachToBackup);
+            return AddSceneObject(sceneObject, attachToBackup);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 05026c3..1564556 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1665,9 +1665,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// Add an object into the scene that has come from storage
         /// </summary>
         /// <param name="sceneObject"></param>
-        public void AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
+        public bool AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
         {
-            m_innerScene.AddRestoredSceneObject(sceneObject, attachToBackup);
+            return m_innerScene.AddRestoredSceneObject(sceneObject, attachToBackup);
         }
 
         /// <summary>
@@ -1678,9 +1678,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// If true, the object is made persistent into the scene.
         /// If false, the object will not persist over server restarts
         /// </param>
-        public void AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
+        public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
         {
-            m_innerScene.AddNewSceneObject(sceneObject, attachToBackup);
+            return m_innerScene.AddNewSceneObject(sceneObject, attachToBackup);
         }
 
         /// <summary>