diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 88043f3..b7cefeb 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; |
@@ -234,7 +234,7 @@ namespace OpenSim.Tests.Common.Mock | |||
234 | public event ScriptReset OnScriptReset; | 234 | public event ScriptReset OnScriptReset; |
235 | public event GetScriptRunning OnGetScriptRunning; | 235 | public event GetScriptRunning OnGetScriptRunning; |
236 | public event SetScriptRunning OnSetScriptRunning; | 236 | public event SetScriptRunning OnSetScriptRunning; |
237 | public event Action<Vector3> OnAutoPilotGo; | 237 | public event Action<Vector3, bool> OnAutoPilotGo; |
238 | 238 | ||
239 | public event TerrainUnacked OnUnackedTerrain; | 239 | public event TerrainUnacked OnUnackedTerrain; |
240 | 240 | ||
@@ -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) |
@@ -579,7 +579,7 @@ namespace OpenSim.Tests.Common.Mock | |||
579 | 579 | ||
580 | // Stage 2: add the new client as a child agent to the scene | 580 | // Stage 2: add the new client as a child agent to the scene |
581 | TeleportSceneClient = new TestClient(newAgent, TeleportTargetScene); | 581 | TeleportSceneClient = new TestClient(newAgent, TeleportTargetScene); |
582 | TeleportTargetScene.AddNewClient(TeleportSceneClient); | 582 | TeleportTargetScene.AddNewClient(TeleportSceneClient, PresenceType.User); |
583 | } | 583 | } |
584 | 584 | ||
585 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, | 585 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, |
@@ -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 | } |
@@ -886,7 +887,7 @@ namespace OpenSim.Tests.Common.Mock | |||
886 | 887 | ||
887 | public void Close() | 888 | public void Close() |
888 | { | 889 | { |
889 | m_scene.RemoveClient(AgentId); | 890 | m_scene.RemoveClient(AgentId, true); |
890 | } | 891 | } |
891 | 892 | ||
892 | public void Start() | 893 | public void Start() |