diff options
| author | nebadon | 2013-07-26 14:13:02 -0400 |
|---|---|---|
| committer | nebadon | 2013-07-26 14:13:02 -0400 |
| commit | d27cc62458f8dc802adb278971ee084d51c4363b (patch) | |
| tree | b631988fa3eadb66a2c9049468aec840897b5f1f /OpenSim/Region/OptionalModules | |
| parent | Force map tiler to save Water.jpg as an actual jpeg format it seems even thou... (diff) | |
| parent | Fix NPC regression test failures. (diff) | |
| download | opensim-SC_OLD-d27cc62458f8dc802adb278971ee084d51c4363b.zip opensim-SC_OLD-d27cc62458f8dc802adb278971ee084d51c4363b.tar.gz opensim-SC_OLD-d27cc62458f8dc802adb278971ee084d51c4363b.tar.bz2 opensim-SC_OLD-d27cc62458f8dc802adb278971ee084d51c4363b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index bf23040..f841d5c 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | |||
| @@ -155,7 +155,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests | |||
| 155 | public void TestCreateWithAttachments() | 155 | public void TestCreateWithAttachments() |
| 156 | { | 156 | { |
| 157 | TestHelpers.InMethod(); | 157 | TestHelpers.InMethod(); |
| 158 | // log4net.Config.XmlConfigurator.Configure(); | 158 | // TestHelpers.EnableLogging(); |
| 159 | 159 | ||
| 160 | UUID userId = TestHelpers.ParseTail(0x1); | 160 | UUID userId = TestHelpers.ParseTail(0x1); |
| 161 | UserAccountHelpers.CreateUserWithInventory(m_scene, userId); | 161 | UserAccountHelpers.CreateUserWithInventory(m_scene, userId); |