Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scene objects.

These can be run using the "nant torture" target.  They are not part of "nant test" due to their long-run future nature.
Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc.
However, data can be inconsistent due to different machine circumstances and virtual machine actions.
This area is under development.

2 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 984058c..975d769 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1943,6 +1943,7 @@ namespace OpenSim.Region.Framework.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 not</returns>
         public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
         {
             return AddNewSceneObject(sceneObject, attachToBackup, true);
@@ -1960,6 +1961,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// If true, updates for the new scene object are sent to all viewers in range.
         /// If false, it is left to the caller to schedule the update
         /// </param>
+        /// <returns>true if the object was added.  false if not</returns>
         public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
         {           
             if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates))
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 36a454e..006f9c6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -357,7 +357,13 @@ namespace OpenSim.Region.Framework.Scenes
                 return false;
 
             if (Entities.ContainsKey(sceneObject.UUID))
+            {
+//                m_log.DebugFormat(
+//                    "[SCENEGRAPH]: Scene graph for {0} already contains object {1} in AddSceneObject()",
+//                    m_parentScene.RegionInfo.RegionName, sceneObject.UUID);
+                
                 return false;
+            }
             
 //            m_log.DebugFormat(
 //                "[SCENEGRAPH]: Adding scene object {0} {1}, with {2} parts on {3}",