diff options
| author | Melanie | 2013-01-26 01:56:23 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-26 01:56:23 +0000 |
| commit | e28c042dce141954477baa1a3babad9ce2a80e58 (patch) | |
| tree | 000f7091deb70abb6b8574d4107e91e259255f40 /OpenSim/Region/OptionalModules/World/NPC | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * This adds llVolumeDetect functionality to the C# implementation of BulletSim. (diff) | |
| download | opensim-SC_OLD-e28c042dce141954477baa1a3babad9ce2a80e58.zip opensim-SC_OLD-e28c042dce141954477baa1a3babad9ce2a80e58.tar.gz opensim-SC_OLD-e28c042dce141954477baa1a3babad9ce2a80e58.tar.bz2 opensim-SC_OLD-e28c042dce141954477baa1a3babad9ce2a80e58.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index 365fd78..34362af 100644 --- 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 | |||
| 74 | [SetUp] | 74 | [SetUp] |
| 75 | public void Init() | 75 | public void Init() |
| 76 | { | 76 | { |
| 77 | base.SetUp(); | ||
| 78 | |||
| 77 | IConfigSource config = new IniConfigSource(); | 79 | IConfigSource config = new IniConfigSource(); |
| 78 | config.AddConfig("NPC"); | 80 | config.AddConfig("NPC"); |
| 79 | config.Configs["NPC"].Set("Enabled", "true"); | 81 | config.Configs["NPC"].Set("Enabled", "true"); |