From 2cb2f1d7e30fa583a9f43ddd6b420deb8e9b56bd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 18:02:19 +0100
Subject: 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
---
.../Tests/Common/Helpers/EntityTransferHelpers.cs | 2 +-
OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 54 ++--------------------
OpenSim/Tests/Common/Mock/TestClient.cs | 20 ++------
3 files changed, 9 insertions(+), 67 deletions(-)
(limited to 'OpenSim/Tests')
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
index 6cc7ff2..1b960b1 100644
--- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Tests.Common
Scene neighbourScene;
SceneManager.Instance.TryGetScene(x, y, out neighbourScene);
- TestClient neighbourTc = new TestClient(newAgent, neighbourScene, SceneManager.Instance);
+ TestClient neighbourTc = new TestClient(newAgent, neighbourScene);
neighbourTcs.Add(neighbourTc);
neighbourScene.AddNewClient(neighbourTc, PresenceType.User);
};
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index bdd9093..d9bb85e 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -447,9 +447,6 @@ namespace OpenSim.Tests.Common
/// Add a root agent where the details of the agent connection (apart from the id) are unimportant for the test
/// </summary>
/// <remarks>
- /// This can be used for tests where there is only one region or where there are multiple non-neighbour regions
- /// and teleport doesn't take place.
- ///
/// XXX: Use the version of this method that takes the UserAccount structure wherever possible - this will
/// make the agent circuit data (e.g. first, lastname) consistent with the user account data.
/// </remarks>
@@ -462,22 +459,6 @@ namespace OpenSim.Tests.Common
}
/// <summary>
- /// Add a root agent where the details of the agent connection (apart from the id) are unimportant for the test
- /// </summary>
- /// <remarks>
- /// XXX: Use the version of this method that takes the UserAccount structure wherever possible - this will
- /// make the agent circuit data (e.g. first, lastname) consistent with the user account data.
- /// </remarks>
- /// <param name="scene"></param>
- /// <param name="agentId"></param>
- /// <param name="sceneManager"></param>
- /// <returns></returns>
- public static ScenePresence AddScenePresence(Scene scene, UUID agentId, SceneManager sceneManager)
- {
- return AddScenePresence(scene, GenerateAgentData(agentId), sceneManager);
- }
-
- /// <summary>
/// Add a root agent.
/// </summary>
/// <param name="scene"></param>
@@ -508,31 +489,7 @@ namespace OpenSim.Tests.Common
/// <returns></returns>
public static ScenePresence AddScenePresence(Scene scene, AgentCircuitData agentData)
{
- return AddScenePresence(scene, agentData, null);
- }
-
- /// <summary>
- /// Add a root agent.
- /// </summary>
- /// <remarks>
- /// This function
- ///
- /// 1) Tells the scene that an agent is coming. Normally, the login service (local if standalone, from the
- /// userserver if grid) would give initial login data back to the client and separately tell the scene that the
- /// agent was coming.
- ///
- /// 2) Connects the agent with the scene
- ///
- /// This function performs actions equivalent with notifying the scene that an agent is
- /// coming and then actually connecting the agent to the scene. The one step missed out is the very first
- /// </remarks>
- /// <param name="scene"></param>
- /// <param name="agentData"></param>
- /// <param name="sceneManager"></param>
- /// <returns></returns>
- public static ScenePresence AddScenePresence(Scene scene, AgentCircuitData agentData, SceneManager sceneManager)
- {
- return AddScenePresence(scene, new TestClient(agentData, scene, sceneManager), agentData, sceneManager);
+ return AddScenePresence(scene, new TestClient(agentData, scene), agentData);
}
/// <summary>
@@ -552,10 +509,9 @@ namespace OpenSim.Tests.Common
/// </remarks>
/// <param name="scene"></param>
/// <param name="agentData"></param>
- /// <param name="sceneManager"></param>
/// <returns></returns>
public static ScenePresence AddScenePresence(
- Scene scene, IClientAPI client, AgentCircuitData agentData, SceneManager sceneManager)
+ Scene scene, IClientAPI client, AgentCircuitData agentData)
{
// We emulate the proper login sequence here by doing things in four stages
@@ -578,10 +534,6 @@ namespace OpenSim.Tests.Common
/// Introduce an agent into the scene by adding a new client.
/// </summary>
/// <returns>The scene presence added</returns>
- /// <param name='sceneManager'>
- /// Scene manager. Can be null if there is only one region in the test or multiple regions that are not
- /// neighbours and where no teleporting takes place.
- /// </param>
/// <param name='scene'></param>
/// <param name='testClient'></param>
/// <param name='agentData'></param>
@@ -607,7 +559,7 @@ namespace OpenSim.Tests.Common
acd.child = true;
// XXX: ViaLogin may not be correct for child agents
- TestClient client = new TestClient(acd, scene, null);
+ TestClient client = new TestClient(acd, scene);
return IntroduceClientToScene(scene, client, acd, TeleportFlags.ViaLogin);
}
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
EventWaitHandle wh = new EventWaitHandle (false, EventResetMode.AutoReset, "Crossing");
private Scene m_scene;
- private SceneManager m_sceneManager;
// Properties so that we can get at received data for test purposes
+ public List<uint> ReceivedKills { get; private set; }
public List<UUID> ReceivedOfflineNotifications { get; private set; }
public List<UUID> ReceivedOnlineNotifications { get; private set; }
public List<UUID> ReceivedFriendshipTerminations { get; private set; }
@@ -434,33 +434,21 @@ namespace OpenSim.Tests.Common.Mock
/// <summary>
/// Constructor
/// </summary>
- /// <remarks>
- /// Can be used for a test where there is only one region or where there are multiple regions that are not
- /// neighbours and where no teleporting takes place. In other situations, the constructor that takes in a
- /// scene manager should be used.
- /// </remarks>
- /// <param name="agentData"></param>
- /// <param name="scene"></param>
- public TestClient(AgentCircuitData agentData, Scene scene) : this(agentData, scene, null) {}
-
- /// <summary>
- /// Constructor
- /// </summary>
/// <param name="agentData"></param>
/// <param name="scene"></param>
/// <param name="sceneManager"></param>
- public TestClient(AgentCircuitData agentData, Scene scene, SceneManager sceneManager)
+ public TestClient(AgentCircuitData agentData, Scene scene)
{
m_agentId = agentData.AgentID;
m_firstName = agentData.firstname;
m_lastName = agentData.lastname;
m_circuitCode = agentData.circuitcode;
m_scene = scene;
- m_sceneManager = sceneManager;
SessionId = agentData.SessionID;
SecureSessionId = agentData.SecureSessionID;
CapsSeedUrl = agentData.CapsPath;
+ ReceivedKills = new List<uint>();
ReceivedOfflineNotifications = new List<UUID>();
ReceivedOnlineNotifications = new List<UUID>();
ReceivedFriendshipTerminations = new List<UUID>();
@@ -534,11 +522,13 @@ namespace OpenSim.Tests.Common.Mock
public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
{
+ ReceivedKills.AddRange(localID);
}
public virtual void SetChildAgentThrottle(byte[] throttle)
{
}
+
public byte[] GetThrottlesPacked(float multiplier)
{
return new byte[0];
--
cgit v1.1
From 3290cd09d3ecd45c52bd131ada2a793c48fd99dc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 18:12:17 +0100
Subject: remove pointless region handle paramter from
IClientAPI.SendKillObject()
---
OpenSim/Tests/Common/Mock/TestClient.cs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'OpenSim/Tests')
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 3f9690f..09e751a 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -517,10 +517,9 @@ namespace OpenSim.Tests.Common.Mock
public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
{
-
}
- public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
+ public virtual void SendKillObject(List<uint> localID)
{
ReceivedKills.AddRange(localID);
}
@@ -534,7 +533,6 @@ namespace OpenSim.Tests.Common.Mock
return new byte[0];
}
-
public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
{
}
--
cgit v1.1
From 292a6037add00c9e8f817c733d8fc375806caf99 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 22:48:10 +0100
Subject: minor: Remove unnecessary code that was generating warning in
TestXInventoryDataPlugin
---
OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Tests')
diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
index 30b1f38..2be5524 100644
--- a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
@@ -118,8 +118,8 @@ namespace OpenSim.Tests.Common.Mock
folder.parentFolderID = new UUID(newParent);
- XInventoryFolder[] newParentFolders
- = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() });
+// XInventoryFolder[] newParentFolders
+// = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() });
// Console.WriteLine(
// "Moved folder {0} {1}, to {2} {3}",
--
cgit v1.1