From 7ff4eec79cf16886439604a23126abd195ae8b2e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 7 Jul 2012 00:02:45 +0100
Subject: Remove redundant SetScene() function in Scene.AddSceneObject()
This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks.
There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
---
OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Tests')
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 3a2e420..d5354cb 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -601,19 +601,36 @@ namespace OpenSim.Tests.Common
ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
{ Name = name, UUID = id, Scale = new Vector3(1, 1, 1) };
}
-
+
///
/// Create a scene object but do not add it to the scene.
///
///
- /// UUID always starts at 00000000-0000-0000-0000-000000000001
+ /// UUID always starts at 00000000-0000-0000-0000-000000000001. For some purposes, (e.g. serializing direct
+ /// to another object's inventory) we do not need a scene unique ID. So it would be better to add the
+ /// UUID when we actually add an object to a scene rather than on creation.
///
/// The number of parts that should be in the scene object
///
///
public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId)
{
- return CreateSceneObject(parts, ownerId, "", 0x1);
+ return CreateSceneObject(parts, ownerId, 0x1);
+ }
+
+ ///
+ /// Create a scene object but do not add it to the scene.
+ ///
+ /// The number of parts that should be in the scene object
+ ///
+ ///
+ /// The hexadecimal last part of the UUID for parts created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}"
+ /// will be given to the root part, and incremented for each part thereafter.
+ ///
+ ///
+ public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, int uuidTail)
+ {
+ return CreateSceneObject(parts, ownerId, "", uuidTail);
}
///
--
cgit v1.1
From 2eaa6d5ace738cf1848f82ce7a0b435928b6846f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 9 Jul 2012 21:24:32 +0100
Subject: Do not allow a script to attach a prim if its being sat upon.
This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar.
This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar.
Recording HashSet is null if there are no sitting avatars in order to save memory.
---
OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 75 +++++++++++++++++-----
OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs | 9 +++
2 files changed, 67 insertions(+), 17 deletions(-)
(limited to 'OpenSim/Tests')
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index d5354cb..769de83 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -412,26 +412,49 @@ namespace OpenSim.Tests.Common
///
public static AgentCircuitData GenerateAgentData(UUID agentId)
{
- string firstName = "testfirstname";
+ AgentCircuitData acd = GenerateCommonAgentData();
- AgentCircuitData agentData = new AgentCircuitData();
- agentData.AgentID = agentId;
- agentData.firstname = firstName;
- agentData.lastname = "testlastname";
+ acd.AgentID = agentId;
+ acd.firstname = "testfirstname";
+ acd.lastname = "testlastname";
+ acd.ServiceURLs = new Dictionary();
+
+ return acd;
+ }
+
+ ///
+ /// Generate some standard agent connection data.
+ ///
+ ///
+ ///
+ public static AgentCircuitData GenerateAgentData(UserAccount ua)
+ {
+ AgentCircuitData acd = GenerateCommonAgentData();
+
+ acd.AgentID = ua.PrincipalID;
+ acd.firstname = ua.FirstName;
+ acd.lastname = ua.LastName;
+ acd.ServiceURLs = ua.ServiceURLs;
+
+ return acd;
+ }
+
+ private static AgentCircuitData GenerateCommonAgentData()
+ {
+ AgentCircuitData acd = new AgentCircuitData();
// XXX: Sessions must be unique, otherwise one presence can overwrite another in NullPresenceData.
- agentData.SessionID = UUID.Random();
- agentData.SecureSessionID = UUID.Random();
-
- agentData.circuitcode = 123;
- agentData.BaseFolder = UUID.Zero;
- agentData.InventoryFolder = UUID.Zero;
- agentData.startpos = Vector3.Zero;
- agentData.CapsPath = "http://wibble.com";
- agentData.ServiceURLs = new Dictionary();
- agentData.Appearance = new AvatarAppearance();
-
- return agentData;
+ acd.SessionID = UUID.Random();
+ acd.SecureSessionID = UUID.Random();
+
+ acd.circuitcode = 123;
+ acd.BaseFolder = UUID.Zero;
+ acd.InventoryFolder = UUID.Zero;
+ acd.startpos = Vector3.Zero;
+ acd.CapsPath = "http://wibble.com";
+ acd.Appearance = new AvatarAppearance();
+
+ return acd;
}
///
@@ -440,6 +463,9 @@ namespace OpenSim.Tests.Common
///
/// 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.
///
///
///
@@ -452,6 +478,10 @@ namespace OpenSim.Tests.Common
///
/// Add a root agent where the details of the agent connection (apart from the id) are unimportant for the test
///
+ ///
+ /// 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.
+ ///
///
///
///
@@ -464,6 +494,17 @@ namespace OpenSim.Tests.Common
///
/// Add a root agent.
///
+ ///
+ ///
+ ///
+ public static ScenePresence AddScenePresence(Scene scene, UserAccount ua)
+ {
+ return AddScenePresence(scene, GenerateAgentData(ua));
+ }
+
+ ///
+ /// Add a root agent.
+ ///
///
/// This function
///
diff --git a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
index 3d3e65c..2fbebc4 100644
--- a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
@@ -138,6 +138,15 @@ namespace OpenSim.Tests.Common
CreateUserWithInventory(scene, ua, pw);
return ua;
}
+
+ public static UserAccount CreateUserWithInventory(
+ Scene scene, string firstName, string lastName, int userId, string pw)
+ {
+ UserAccount ua
+ = new UserAccount(TestHelpers.ParseTail(userId)) { FirstName = firstName, LastName = lastName };
+ CreateUserWithInventory(scene, ua, pw);
+ return ua;
+ }
public static void CreateUserWithInventory(Scene scene, UserAccount ua, string pw)
{
--
cgit v1.1