Merge branch 'master' into careminster

2026-08-06 01:06:30 +08:00 · 2013-01-26 01:56:23 +00:00
parent 0b8bf69470 5128ae7b86
commit e28c042dce
10 changed files with 523 additions and 118 deletions
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -74,6 +74,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
        [SetUp]
        public void Init()
        {
+            base.SetUp();
+
            IConfigSource config = new IniConfigSource();
            config.AddConfig("NPC");
            config.Configs["NPC"].Set("Enabled", "true");