diff options
| author | Justin Clark-Casey (justincc) | 2013-07-26 18:43:15 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-07-26 18:43:15 +0100 |
| commit | a08f01fa8323e18a63e920158c7f51ae78ac0e93 (patch) | |
| tree | 4e299c4bb51ba800491564c405c796739397511d /OpenSim/Region/OptionalModules | |
| parent | Comment debug message (diff) | |
| download | opensim-SC_OLD-a08f01fa8323e18a63e920158c7f51ae78ac0e93.zip opensim-SC_OLD-a08f01fa8323e18a63e920158c7f51ae78ac0e93.tar.gz opensim-SC_OLD-a08f01fa8323e18a63e920158c7f51ae78ac0e93.tar.bz2 opensim-SC_OLD-a08f01fa8323e18a63e920158c7f51ae78ac0e93.tar.xz | |
Fix NPC regression test failures.
These were genuine failures caused by ScenePresence.CompleteMovement() waiting for an UpdateAgent from NPC introduction that would never come.
Instead, we do not wait if the agent is an NPC.
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); |