Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
2026-08-07 01:35:46 +08:00 · 2013-04-30 23:45:38 +01:00
parent 7c729e1519 46ae84cfba
commit b89d18e6f4
9 changed files with 549 additions and 97 deletions
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
@@ -75,6 +75,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
        [SetUp]
        public void SetUp()
        {
+            base.SetUp();
+
            UUID userId = TestHelpers.ParseTail(0x3);

            J2KDecoderModule j2kdm = new J2KDecoderModule();