Merge branch 'master' into bulletsim

2 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
index 9b68331..99eb124 100644
--- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common
         /// <returns></returns>
         public static AssetBase CreateAsset()
         {
-            return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", UUID.Random());
+            return CreateAsset(UUID.Random());
         }
 
         /// <summary>
@@ -50,9 +50,9 @@ namespace OpenSim.Tests.Common
         /// </summary>
         /// <param name="creatorId">/param>
         /// <returns></returns>
-        public static AssetBase CreateAsset(UUID creatorId)
+        public static AssetBase CreateAsset(UUID id)
         {
-            return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId);
+            return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random());
         }
         
         /// <summary>
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index bf91ab5..88043f3 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Tests.Common.Mock
         public event ScriptReset OnScriptReset;
         public event GetScriptRunning OnGetScriptRunning;
         public event SetScriptRunning OnSetScriptRunning;
-        public event UpdateVector OnAutoPilotGo;
+        public event Action<Vector3> OnAutoPilotGo;
 
         public event TerrainUnacked OnUnackedTerrain;
 
@@ -1214,7 +1214,7 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
+        public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
         {
         }