Merge branch 'master' into careminster-presence-refactor

This brings careminster on the level of master. To be tested

1 files changed, 3 insertions, 6 deletions

diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
index 1188b62..1fc3cb5 100644
--- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
@@ -38,12 +38,9 @@ namespace OpenSim.Tests.Common
         /// <summary>
         /// Create an asset from the given data
         /// </summary>
-        /// <param name="assetUuid"></param>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        public static AssetBase CreateAsset(UUID assetUuid, string data)
+        public static AssetBase CreateAsset(UUID assetUuid, string data, UUID creatorID)
         {
-            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object);
+            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, creatorID.ToString());
             asset.Data = Encoding.ASCII.GetBytes(data);
             return asset;
         }
@@ -56,7 +53,7 @@ namespace OpenSim.Tests.Common
         /// <returns></returns>
         public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog)
         {
-            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object);
+            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, sog.OwnerID.ToString());
             asset.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog));
             return asset;
         }