aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-26 18:43:15 +0100
committerJustin Clark-Casey (justincc)2013-07-26 18:43:15 +0100
commita08f01fa8323e18a63e920158c7f51ae78ac0e93 (patch)
tree4e299c4bb51ba800491564c405c796739397511d /OpenSim/Region
parentComment debug message (diff)
downloadopensim-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')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs1
3 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4044f0c..17da0d9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1357,11 +1357,13 @@ namespace OpenSim.Region.Framework.Scenes
1357 client.Name, Scene.RegionInfo.RegionName, AbsolutePosition); 1357 client.Name, Scene.RegionInfo.RegionName, AbsolutePosition);
1358 1358
1359 // Make sure it's not a login agent. We don't want to wait for updates during login 1359 // Make sure it's not a login agent. We don't want to wait for updates during login
1360 if ((m_teleportFlags & TeleportFlags.ViaLogin) == 0) 1360 if (PresenceType != PresenceType.Npc && (m_teleportFlags & TeleportFlags.ViaLogin) == 0)
1361 {
1361 // Let's wait until UpdateAgent (called by departing region) is done 1362 // Let's wait until UpdateAgent (called by departing region) is done
1362 if (!WaitForUpdateAgent(client)) 1363 if (!WaitForUpdateAgent(client))
1363 // The sending region never sent the UpdateAgent data, we have to refuse 1364 // The sending region never sent the UpdateAgent data, we have to refuse
1364 return; 1365 return;
1366 }
1365 1367
1366 Vector3 look = Velocity; 1368 Vector3 look = Velocity;
1367 1369
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);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 74f010e..495e684 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -180,6 +180,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
180 public void TestOsNpcLoadAppearance() 180 public void TestOsNpcLoadAppearance()
181 { 181 {
182 TestHelpers.InMethod(); 182 TestHelpers.InMethod();
183 //TestHelpers.EnableLogging();
183 184
184 // Store an avatar with a different height from default in a notecard. 185 // Store an avatar with a different height from default in a notecard.
185 UUID userId = TestHelpers.ParseTail(0x1); 186 UUID userId = TestHelpers.ParseTail(0x1);