diff options
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 070e390..8d2108c 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -383,7 +383,7 @@ namespace OpenSim.Tests.Common | |||
383 | 383 | ||
384 | // Stage 3: Complete the entrance into the region. This converts the child agent into a root agent. | 384 | // Stage 3: Complete the entrance into the region. This converts the child agent into a root agent. |
385 | ScenePresence scp = scene.GetScenePresence(agentData.AgentID); | 385 | ScenePresence scp = scene.GetScenePresence(agentData.AgentID); |
386 | scp.CompleteMovement(client); | 386 | scp.CompleteMovement(client, true); |
387 | //scp.MakeRootAgent(new Vector3(90, 90, 90), true); | 387 | //scp.MakeRootAgent(new Vector3(90, 90, 90), true); |
388 | 388 | ||
389 | return scp; | 389 | return scp; |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 88043f3..7ec6e10 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -95,7 +95,7 @@ namespace OpenSim.Tests.Common.Mock | |||
95 | public event DeRezObject OnDeRezObject; | 95 | public event DeRezObject OnDeRezObject; |
96 | public event Action<IClientAPI> OnRegionHandShakeReply; | 96 | public event Action<IClientAPI> OnRegionHandShakeReply; |
97 | public event GenericCall1 OnRequestWearables; | 97 | public event GenericCall1 OnRequestWearables; |
98 | public event GenericCall1 OnCompleteMovementToRegion; | 98 | public event Action<IClientAPI, bool> OnCompleteMovementToRegion; |
99 | public event UpdateAgent OnPreAgentUpdate; | 99 | public event UpdateAgent OnPreAgentUpdate; |
100 | public event UpdateAgent OnAgentUpdate; | 100 | public event UpdateAgent OnAgentUpdate; |
101 | public event AgentRequestSit OnAgentRequestSit; | 101 | public event AgentRequestSit OnAgentRequestSit; |
@@ -455,7 +455,7 @@ namespace OpenSim.Tests.Common.Mock | |||
455 | 455 | ||
456 | public void CompleteMovement() | 456 | public void CompleteMovement() |
457 | { | 457 | { |
458 | OnCompleteMovementToRegion(this); | 458 | OnCompleteMovementToRegion(this, true); |
459 | } | 459 | } |
460 | 460 | ||
461 | public virtual void ActivateGesture(UUID assetId, UUID gestureId) | 461 | public virtual void ActivateGesture(UUID assetId, UUID gestureId) |
@@ -759,9 +759,10 @@ namespace OpenSim.Tests.Common.Mock | |||
759 | 759 | ||
760 | if (OnCompleteMovementToRegion != null) | 760 | if (OnCompleteMovementToRegion != null) |
761 | { | 761 | { |
762 | OnCompleteMovementToRegion(this); | 762 | OnCompleteMovementToRegion(this, true); |
763 | } | 763 | } |
764 | } | 764 | } |
765 | |||
765 | public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) | 766 | public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) |
766 | { | 767 | { |
767 | } | 768 | } |