Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge

4 files changed, 10 insertions, 10 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
index 2ff1920..5adb845 100644
--- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
+++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            AssetBase asset = AssetHelpers.CreateAsset();
+            AssetBase asset = AssetHelpers.CreateNotecardAsset();
             asset.ID = TestHelpers.ParseTail(0x1).ToString();
 
             // Check we don't get anything before the asset is put in the cache
@@ -96,7 +96,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            AssetBase asset = AssetHelpers.CreateAsset();
+            AssetBase asset = AssetHelpers.CreateNotecardAsset();
             asset.ID = TestHelpers.ParseTail(0x2).ToString();
 
             m_cache.Store(asset);
@@ -112,8 +112,8 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-
-            AssetBase asset = AssetHelpers.CreateAsset();
+            
+            AssetBase asset = AssetHelpers.CreateNotecardAsset();
             asset.ID = TestHelpers.ParseTail(0x2).ToString();
 
             m_cache.Store(asset);
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index ce8d1db..174d74c 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
 
             // We also need to add the texture to the asset service, otherwise the AvatarFactoryModule will tell
             // ScenePresence.SendInitialData() to reset our entire appearance.
-            scene.AssetService.Store(AssetHelpers.CreateAsset(originalFace8TextureId));
+            scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
 
             afm.SetAppearance(sp, originalTe, null);
 
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
index 99eb124..4839bcb 100644
--- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
@@ -40,9 +40,9 @@ namespace OpenSim.Tests.Common
         /// Create a notecard asset with a random uuids and dummy text.
         /// </summary>
         /// <returns></returns>
-        public static AssetBase CreateAsset()
+        public static AssetBase CreateNotecardAsset()
         {
-            return CreateAsset(UUID.Random());
+            return CreateNotecardAsset(UUID.Random());
         }
 
         /// <summary>
@@ -50,7 +50,7 @@ namespace OpenSim.Tests.Common
         /// </summary>
         /// <param name="creatorId">/param>
         /// <returns></returns>
-        public static AssetBase CreateAsset(UUID id)
+        public static AssetBase CreateNotecardAsset(UUID id)
         {
             return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random());
         }
@@ -60,7 +60,7 @@ namespace OpenSim.Tests.Common
         /// </summary>
         /// <param name="creatorId">/param>
         /// <returns></returns>
-        public static AssetBase CreateAsset(Scene scene, UUID creatorId)
+        public static AssetBase CreateNotecardAsset(Scene scene, UUID creatorId)
         {
             AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId);
             scene.AssetService.Store(asset);
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index ceb7905..0de38c2 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Tests.Common
             AssetBase asset = null;
 
             if (type == InventoryType.Notecard)
-                asset = AssetHelpers.CreateAsset(scene, userId);
+                asset = AssetHelpers.CreateNotecardAsset(scene, userId);
             else if (type == InventoryType.Object)
                 asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
             else