diff options
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestClient.cs')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 32f6a64..26479be 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -47,9 +47,9 @@ namespace OpenSim.Tests.Common.Mock | |||
47 | EventWaitHandle wh = new EventWaitHandle (false, EventResetMode.AutoReset, "Crossing"); | 47 | EventWaitHandle wh = new EventWaitHandle (false, EventResetMode.AutoReset, "Crossing"); |
48 | 48 | ||
49 | private Scene m_scene; | 49 | private Scene m_scene; |
50 | private SceneManager m_sceneManager; | ||
51 | 50 | ||
52 | // Properties so that we can get at received data for test purposes | 51 | // Properties so that we can get at received data for test purposes |
52 | public List<uint> ReceivedKills { get; private set; } | ||
53 | public List<UUID> ReceivedOfflineNotifications { get; private set; } | 53 | public List<UUID> ReceivedOfflineNotifications { get; private set; } |
54 | public List<UUID> ReceivedOnlineNotifications { get; private set; } | 54 | public List<UUID> ReceivedOnlineNotifications { get; private set; } |
55 | public List<UUID> ReceivedFriendshipTerminations { get; private set; } | 55 | public List<UUID> ReceivedFriendshipTerminations { get; private set; } |
@@ -437,33 +437,21 @@ namespace OpenSim.Tests.Common.Mock | |||
437 | /// <summary> | 437 | /// <summary> |
438 | /// Constructor | 438 | /// Constructor |
439 | /// </summary> | 439 | /// </summary> |
440 | /// <remarks> | ||
441 | /// Can be used for a test where there is only one region or where there are multiple regions that are not | ||
442 | /// neighbours and where no teleporting takes place. In other situations, the constructor that takes in a | ||
443 | /// scene manager should be used. | ||
444 | /// </remarks> | ||
445 | /// <param name="agentData"></param> | ||
446 | /// <param name="scene"></param> | ||
447 | public TestClient(AgentCircuitData agentData, Scene scene) : this(agentData, scene, null) {} | ||
448 | |||
449 | /// <summary> | ||
450 | /// Constructor | ||
451 | /// </summary> | ||
452 | /// <param name="agentData"></param> | 440 | /// <param name="agentData"></param> |
453 | /// <param name="scene"></param> | 441 | /// <param name="scene"></param> |
454 | /// <param name="sceneManager"></param> | 442 | /// <param name="sceneManager"></param> |
455 | public TestClient(AgentCircuitData agentData, Scene scene, SceneManager sceneManager) | 443 | public TestClient(AgentCircuitData agentData, Scene scene) |
456 | { | 444 | { |
457 | m_agentId = agentData.AgentID; | 445 | m_agentId = agentData.AgentID; |
458 | m_firstName = agentData.firstname; | 446 | m_firstName = agentData.firstname; |
459 | m_lastName = agentData.lastname; | 447 | m_lastName = agentData.lastname; |
460 | m_circuitCode = agentData.circuitcode; | 448 | m_circuitCode = agentData.circuitcode; |
461 | m_scene = scene; | 449 | m_scene = scene; |
462 | m_sceneManager = sceneManager; | ||
463 | SessionId = agentData.SessionID; | 450 | SessionId = agentData.SessionID; |
464 | SecureSessionId = agentData.SecureSessionID; | 451 | SecureSessionId = agentData.SecureSessionID; |
465 | CapsSeedUrl = agentData.CapsPath; | 452 | CapsSeedUrl = agentData.CapsPath; |
466 | 453 | ||
454 | ReceivedKills = new List<uint>(); | ||
467 | ReceivedOfflineNotifications = new List<UUID>(); | 455 | ReceivedOfflineNotifications = new List<UUID>(); |
468 | ReceivedOnlineNotifications = new List<UUID>(); | 456 | ReceivedOnlineNotifications = new List<UUID>(); |
469 | ReceivedFriendshipTerminations = new List<UUID>(); | 457 | ReceivedFriendshipTerminations = new List<UUID>(); |
@@ -532,11 +520,11 @@ namespace OpenSim.Tests.Common.Mock | |||
532 | 520 | ||
533 | public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) | 521 | public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) |
534 | { | 522 | { |
535 | |||
536 | } | 523 | } |
537 | 524 | ||
538 | public virtual void SendKillObject(ulong regionHandle, List<uint> localID) | 525 | public virtual void SendKillObject(List<uint> localID) |
539 | { | 526 | { |
527 | ReceivedKills.AddRange(localID); | ||
540 | } | 528 | } |
541 | 529 | ||
542 | public virtual void SetChildAgentThrottle(byte[] throttle) | 530 | public virtual void SetChildAgentThrottle(byte[] throttle) |
@@ -545,15 +533,13 @@ namespace OpenSim.Tests.Common.Mock | |||
545 | 533 | ||
546 | public void SetAgentThrottleSilent(int throttle, int setting) | 534 | public void SetAgentThrottleSilent(int throttle, int setting) |
547 | { | 535 | { |
548 | |||
549 | |||
550 | } | 536 | } |
537 | |||
551 | public byte[] GetThrottlesPacked(float multiplier) | 538 | public byte[] GetThrottlesPacked(float multiplier) |
552 | { | 539 | { |
553 | return new byte[0]; | 540 | return new byte[0]; |
554 | } | 541 | } |
555 | 542 | ||
556 | |||
557 | public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs) | 543 | public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs) |
558 | { | 544 | { |
559 | } | 545 | } |