diff options
author | Justin Clark-Casey (justincc) | 2011-02-18 22:49:19 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-02-18 22:49:19 +0000 |
commit | eb699df5f6c7a68a500e38dc994ed7c2f2aa89d9 (patch) | |
tree | 571c3c288077dafedb1f976b734406c0a80f4763 /OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |
parent | remove another unused test teardown method (diff) | |
download | opensim-SC_OLD-eb699df5f6c7a68a500e38dc994ed7c2f2aa89d9.zip opensim-SC_OLD-eb699df5f6c7a68a500e38dc994ed7c2f2aa89d9.tar.gz opensim-SC_OLD-eb699df5f6c7a68a500e38dc994ed7c2f2aa89d9.tar.bz2 opensim-SC_OLD-eb699df5f6c7a68a500e38dc994ed7c2f2aa89d9.tar.xz |
On SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() for the last stage of AddRootAgent() instead of SP.MakeRootAgent()
Going this extra step doesn't appear to cause any test failures.
This is arguably better for test purposes, though at some stage another method may arise which does just call AddRootAgent().
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 8b16496..d199e42 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -504,12 +504,10 @@ namespace OpenSim.Tests.Common.Setup | |||
504 | TestClient client = new TestClient(agentData, scene); | 504 | TestClient client = new TestClient(agentData, scene); |
505 | scene.AddNewClient(client); | 505 | scene.AddNewClient(client); |
506 | 506 | ||
507 | // Stage 3: Invoke agent crossing, which converts the child agent into a root agent (with appearance, | 507 | // Stage 3: Complete the entrance into the region. This converts the child agent into a root agent. |
508 | // inventory, etc.) | ||
509 | //scene.AgentCrossing(agentData.AgentID, new Vector3(90, 90, 90), false); OBSOLETE | ||
510 | |||
511 | ScenePresence scp = scene.GetScenePresence(agentData.AgentID); | 508 | ScenePresence scp = scene.GetScenePresence(agentData.AgentID); |
512 | scp.MakeRootAgent(new Vector3(90, 90, 90), true); | 509 | scp.CompleteMovement(client); |
510 | //scp.MakeRootAgent(new Vector3(90, 90, 90), true); | ||
513 | 511 | ||
514 | return client; | 512 | return client; |
515 | } | 513 | } |