diff options
author | Melanie | 2013-04-30 23:45:38 +0100 |
---|---|---|
committer | Melanie | 2013-04-30 23:45:38 +0100 |
commit | b89d18e6f4a1099fe031ebf10776a752826604b9 (patch) | |
tree | b964e6b167e156dc2adeddeb733d93eac342e9c0 /OpenSim/Tests/Common/Mock/TestClient.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | BulletSim: fix error messages created while an avatar has no initial (diff) | |
download | opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.zip opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.gz opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.bz2 opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestClient.cs')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 07de06c..e7c1633 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -61,6 +61,7 @@ namespace OpenSim.Tests.Common.Mock | |||
61 | // Test client specific events - for use by tests to implement some IClientAPI behaviour. | 61 | // Test client specific events - for use by tests to implement some IClientAPI behaviour. |
62 | public event Action<RegionInfo, Vector3, Vector3> OnReceivedMoveAgentIntoRegion; | 62 | public event Action<RegionInfo, Vector3, Vector3> OnReceivedMoveAgentIntoRegion; |
63 | public event Action<ulong, IPEndPoint> OnTestClientInformClientOfNeighbour; | 63 | public event Action<ulong, IPEndPoint> OnTestClientInformClientOfNeighbour; |
64 | public event Action<GridInstantMessage> OnReceivedInstantMessage; | ||
64 | 65 | ||
65 | // disable warning: public events, part of the public API | 66 | // disable warning: public events, part of the public API |
66 | #pragma warning disable 67 | 67 | #pragma warning disable 67 |
@@ -487,6 +488,18 @@ namespace OpenSim.Tests.Common.Mock | |||
487 | OnCompleteMovementToRegion(this, true); | 488 | OnCompleteMovementToRegion(this, true); |
488 | } | 489 | } |
489 | 490 | ||
491 | /// <summary> | ||
492 | /// Emulate sending an IM from the viewer to the simulator. | ||
493 | /// </summary> | ||
494 | /// <param name='im'></param> | ||
495 | public void HandleImprovedInstantMessage(GridInstantMessage im) | ||
496 | { | ||
497 | ImprovedInstantMessage handlerInstantMessage = OnInstantMessage; | ||
498 | |||
499 | if (handlerInstantMessage != null) | ||
500 | handlerInstantMessage(this, im); | ||
501 | } | ||
502 | |||
490 | public virtual void ActivateGesture(UUID assetId, UUID gestureId) | 503 | public virtual void ActivateGesture(UUID assetId, UUID gestureId) |
491 | { | 504 | { |
492 | } | 505 | } |
@@ -547,7 +560,8 @@ namespace OpenSim.Tests.Common.Mock | |||
547 | 560 | ||
548 | public void SendInstantMessage(GridInstantMessage im) | 561 | public void SendInstantMessage(GridInstantMessage im) |
549 | { | 562 | { |
550 | 563 | if (OnReceivedInstantMessage != null) | |
564 | OnReceivedInstantMessage(im); | ||
551 | } | 565 | } |
552 | 566 | ||
553 | public void SendGenericMessage(string method, UUID invoice, List<string> message) | 567 | public void SendGenericMessage(string method, UUID invoice, List<string> message) |