aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-01-31 19:56:37 +0000
committerJustin Clark-Casey (justincc)2012-01-31 19:56:37 +0000
commitf3780b9eaeae8834c49f6e2f6045ef922916924d (patch)
tree59c334a043cbf9d3bf6c50527cadacd2fcc652f7 /OpenSim/Region/Framework/Scenes/Scene.cs
parentFix:llSetText - limited text to a maximum of 254 chars (diff)
downloadopensim-SC_OLD-f3780b9eaeae8834c49f6e2f6045ef922916924d.zip
opensim-SC_OLD-f3780b9eaeae8834c49f6e2f6045ef922916924d.tar.gz
opensim-SC_OLD-f3780b9eaeae8834c49f6e2f6045ef922916924d.tar.bz2
opensim-SC_OLD-f3780b9eaeae8834c49f6e2f6045ef922916924d.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 2 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
1943 /// If true, the object is made persistent into the scene. 1943 /// If true, the object is made persistent into the scene.
1944 /// If false, the object will not persist over server restarts 1944 /// If false, the object will not persist over server restarts
1945 /// </param> 1945 /// </param>
1946 /// <returns>true if the object was added. false if not</returns>
1946 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) 1947 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
1947 { 1948 {
1948 return AddNewSceneObject(sceneObject, attachToBackup, true); 1949 return AddNewSceneObject(sceneObject, attachToBackup, true);
@@ -1960,6 +1961,7 @@ namespace OpenSim.Region.Framework.Scenes
1960 /// If true, updates for the new scene object are sent to all viewers in range. 1961 /// If true, updates for the new scene object are sent to all viewers in range.
1961 /// If false, it is left to the caller to schedule the update 1962 /// If false, it is left to the caller to schedule the update
1962 /// </param> 1963 /// </param>
1964 /// <returns>true if the object was added. false if not</returns>
1963 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) 1965 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
1964 { 1966 {
1965 if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates)) 1967 if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates))