diff options
author | Justin Clark-Casey (justincc) | 2012-09-27 00:12:34 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-27 00:12:34 +0100 |
commit | 2bf42f30af5030890b8e3ff5bb29074a1f0e9085 (patch) | |
tree | 5aeb7aeb87231e97e8cec78aa1dac0fbf7b4fc72 /OpenSim/Region/Framework/Scenes/Tests | |
parent | Don't store undo states if a scene object is manipulated when it is not in a ... (diff) | |
download | opensim-SC-2bf42f30af5030890b8e3ff5bb29074a1f0e9085.zip opensim-SC-2bf42f30af5030890b8e3ff5bb29074a1f0e9085.tar.gz opensim-SC-2bf42f30af5030890b8e3ff5bb29074a1f0e9085.tar.bz2 opensim-SC-2bf42f30af5030890b8e3ff5bb29074a1f0e9085.tar.xz |
Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.
This controls how many undo steps the simulator will store for each prim.
Default is now 20 rather than 5 as it briefly was.
The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs index e931859..89647d6 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs | |||
@@ -62,8 +62,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
62 | Assert.That(g1Post.RootPart.Scale.X, Is.EqualTo(2)); | 62 | Assert.That(g1Post.RootPart.Scale.X, Is.EqualTo(2)); |
63 | Assert.That(g1Post.RootPart.Scale.Y, Is.EqualTo(3)); | 63 | Assert.That(g1Post.RootPart.Scale.Y, Is.EqualTo(3)); |
64 | Assert.That(g1Post.RootPart.Scale.Z, Is.EqualTo(4)); | 64 | Assert.That(g1Post.RootPart.Scale.Z, Is.EqualTo(4)); |
65 | |||
66 | Assert.That(g1Post.RootPart.UndoCount, Is.EqualTo(1)); | ||
67 | } | 65 | } |
68 | 66 | ||
69 | /// <summary> | 67 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs index 133fac5..96973de 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs | |||
@@ -52,6 +52,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
52 | Vector3 secondSize = new Vector3(5, 6, 7); | 52 | Vector3 secondSize = new Vector3(5, 6, 7); |
53 | 53 | ||
54 | Scene scene = new SceneHelpers().SetupScene(); | 54 | Scene scene = new SceneHelpers().SetupScene(); |
55 | scene.MaxUndoCount = 20; | ||
55 | SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene); | 56 | SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene); |
56 | 57 | ||
57 | // TODO: It happens to be the case that we are not storing undo states for SOPs which are not yet in a SOG, | 58 | // TODO: It happens to be the case that we are not storing undo states for SOPs which are not yet in a SOG, |
@@ -113,6 +114,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
113 | Vector3 fourthSize = new Vector3(11, 12, 13); | 114 | Vector3 fourthSize = new Vector3(11, 12, 13); |
114 | 115 | ||
115 | Scene scene = new SceneHelpers().SetupScene(); | 116 | Scene scene = new SceneHelpers().SetupScene(); |
117 | scene.MaxUndoCount = 20; | ||
116 | SceneObjectGroup g1 = SceneHelpers.CreateSceneObject(1, TestHelpers.ParseTail(0x1)); | 118 | SceneObjectGroup g1 = SceneHelpers.CreateSceneObject(1, TestHelpers.ParseTail(0x1)); |
117 | 119 | ||
118 | g1.GroupResize(firstSize); | 120 | g1.GroupResize(firstSize); |
@@ -133,6 +135,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
133 | Vector3 newSize = new Vector3(2, 3, 4); | 135 | Vector3 newSize = new Vector3(2, 3, 4); |
134 | 136 | ||
135 | Scene scene = new SceneHelpers().SetupScene(); | 137 | Scene scene = new SceneHelpers().SetupScene(); |
138 | scene.MaxUndoCount = 20; | ||
136 | SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene); | 139 | SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene); |
137 | Vector3 originalSize = g1.GroupScale; | 140 | Vector3 originalSize = g1.GroupScale; |
138 | 141 | ||
@@ -160,6 +163,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
160 | Vector3 newSize = new Vector3(2, 3, 4); | 163 | Vector3 newSize = new Vector3(2, 3, 4); |
161 | 164 | ||
162 | Scene scene = new SceneHelpers().SetupScene(); | 165 | Scene scene = new SceneHelpers().SetupScene(); |
166 | scene.MaxUndoCount = 20; | ||
163 | SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene); | 167 | SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene); |
164 | Vector3 originalSize = g1.GroupScale; | 168 | Vector3 originalSize = g1.GroupScale; |
165 | 169 | ||