Merge branch 'master' into bulletsim

2 files changed, 12 insertions, 3 deletions

diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
index aa55bcd..9b68331 100644
--- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
@@ -37,6 +37,15 @@ namespace OpenSim.Tests.Common
     public class AssetHelpers
     {
         /// <summary>
+        /// Create a notecard asset with a random uuids and dummy text.
+        /// </summary>
+        /// <returns></returns>
+        public static AssetBase CreateAsset()
+        {
+            return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", UUID.Random());
+        }
+
+        /// <summary>
         /// Create a notecard asset with a random uuid and dummy text.
         /// </summary>
         /// <param name="creatorId">/param>
diff --git a/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs
index bef0481..70621d5 100644
--- a/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs
@@ -341,9 +341,9 @@ namespace OpenSim.Tests.Common
         /// <param name="scene"></param>
         /// <param name="agentId"></param>
         /// <returns></returns>
-        public static TestClient AddRootAgent(Scene scene, UUID agentId)
+        public static TestClient AddClient(Scene scene, UUID agentId)
         {
-            return AddRootAgent(scene, GenerateAgentData(agentId));
+            return AddClient(scene, GenerateAgentData(agentId));
         }
 
         /// <summary>
@@ -364,7 +364,7 @@ namespace OpenSim.Tests.Common
         /// <param name="scene"></param>
         /// <param name="agentData"></param>
         /// <returns></returns>
-        public static TestClient AddRootAgent(Scene scene, AgentCircuitData agentData)
+        public static TestClient AddClient(Scene scene, AgentCircuitData agentData)
         {
             string reason;