diff options
author | Justin Clark-Casey (justincc) | 2013-05-09 18:02:19 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-05-09 18:02:19 +0100 |
commit | 2cb2f1d7e30fa583a9f43ddd6b420deb8e9b56bd (patch) | |
tree | 9987f2b312bed1e82d9f9c69bb0f2b5a7b341b6b /OpenSim/Tests/Common/Mock/TestClient.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-2cb2f1d7e30fa583a9f43ddd6b420deb8e9b56bd.zip opensim-SC_OLD-2cb2f1d7e30fa583a9f43ddd6b420deb8e9b56bd.tar.gz opensim-SC_OLD-2cb2f1d7e30fa583a9f43ddd6b420deb8e9b56bd.tar.bz2 opensim-SC_OLD-2cb2f1d7e30fa583a9f43ddd6b420deb8e9b56bd.tar.xz |
Fix issue where objects removed via llDie() would not disappear for users looking in from neighbouring sims.
This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason.
Added regression test for this case.
This fixes http://opensimulator.org/mantis/view.php?id=6627
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 664ecb6..3f9690f 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; } |
@@ -434,33 +434,21 @@ namespace OpenSim.Tests.Common.Mock | |||
434 | /// <summary> | 434 | /// <summary> |
435 | /// Constructor | 435 | /// Constructor |
436 | /// </summary> | 436 | /// </summary> |
437 | /// <remarks> | ||
438 | /// Can be used for a test where there is only one region or where there are multiple regions that are not | ||
439 | /// neighbours and where no teleporting takes place. In other situations, the constructor that takes in a | ||
440 | /// scene manager should be used. | ||
441 | /// </remarks> | ||
442 | /// <param name="agentData"></param> | ||
443 | /// <param name="scene"></param> | ||
444 | public TestClient(AgentCircuitData agentData, Scene scene) : this(agentData, scene, null) {} | ||
445 | |||
446 | /// <summary> | ||
447 | /// Constructor | ||
448 | /// </summary> | ||
449 | /// <param name="agentData"></param> | 437 | /// <param name="agentData"></param> |
450 | /// <param name="scene"></param> | 438 | /// <param name="scene"></param> |
451 | /// <param name="sceneManager"></param> | 439 | /// <param name="sceneManager"></param> |
452 | public TestClient(AgentCircuitData agentData, Scene scene, SceneManager sceneManager) | 440 | public TestClient(AgentCircuitData agentData, Scene scene) |
453 | { | 441 | { |
454 | m_agentId = agentData.AgentID; | 442 | m_agentId = agentData.AgentID; |
455 | m_firstName = agentData.firstname; | 443 | m_firstName = agentData.firstname; |
456 | m_lastName = agentData.lastname; | 444 | m_lastName = agentData.lastname; |
457 | m_circuitCode = agentData.circuitcode; | 445 | m_circuitCode = agentData.circuitcode; |
458 | m_scene = scene; | 446 | m_scene = scene; |
459 | m_sceneManager = sceneManager; | ||
460 | SessionId = agentData.SessionID; | 447 | SessionId = agentData.SessionID; |
461 | SecureSessionId = agentData.SecureSessionID; | 448 | SecureSessionId = agentData.SecureSessionID; |
462 | CapsSeedUrl = agentData.CapsPath; | 449 | CapsSeedUrl = agentData.CapsPath; |
463 | 450 | ||
451 | ReceivedKills = new List<uint>(); | ||
464 | ReceivedOfflineNotifications = new List<UUID>(); | 452 | ReceivedOfflineNotifications = new List<UUID>(); |
465 | ReceivedOnlineNotifications = new List<UUID>(); | 453 | ReceivedOnlineNotifications = new List<UUID>(); |
466 | ReceivedFriendshipTerminations = new List<UUID>(); | 454 | ReceivedFriendshipTerminations = new List<UUID>(); |
@@ -534,11 +522,13 @@ namespace OpenSim.Tests.Common.Mock | |||
534 | 522 | ||
535 | public virtual void SendKillObject(ulong regionHandle, List<uint> localID) | 523 | public virtual void SendKillObject(ulong regionHandle, List<uint> localID) |
536 | { | 524 | { |
525 | ReceivedKills.AddRange(localID); | ||
537 | } | 526 | } |
538 | 527 | ||
539 | public virtual void SetChildAgentThrottle(byte[] throttle) | 528 | public virtual void SetChildAgentThrottle(byte[] throttle) |
540 | { | 529 | { |
541 | } | 530 | } |
531 | |||
542 | public byte[] GetThrottlesPacked(float multiplier) | 532 | public byte[] GetThrottlesPacked(float multiplier) |
543 | { | 533 | { |
544 | return new byte[0]; | 534 | return new byte[0]; |