Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
2026-08-06 09:16:28 +08:00 · 2013-03-13 02:02:46 +00:00
parent 1e7c7fb779 b7216f4daf
commit 710381e838
9 changed files with 197 additions and 40 deletions
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -49,8 +49,10 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
        private TestScene m_scene;

        [SetUp]
-        public void SetUp()
+        public override void SetUp()
        {
+            base.SetUp();
+
            uint port = 9999;
            uint sslPort = 9998;