refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAsset()
parent
a1f05a289d
commit
9b3bbedeea
|
@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
|
||||||
TestHelpers.InMethod();
|
TestHelpers.InMethod();
|
||||||
// log4net.Config.XmlConfigurator.Configure();
|
// log4net.Config.XmlConfigurator.Configure();
|
||||||
|
|
||||||
AssetBase asset = AssetHelpers.CreateAsset();
|
AssetBase asset = AssetHelpers.CreateNotecardAsset();
|
||||||
asset.ID = TestHelpers.ParseTail(0x1).ToString();
|
asset.ID = TestHelpers.ParseTail(0x1).ToString();
|
||||||
|
|
||||||
// Check we don't get anything before the asset is put in the cache
|
// 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();
|
TestHelpers.InMethod();
|
||||||
// log4net.Config.XmlConfigurator.Configure();
|
// log4net.Config.XmlConfigurator.Configure();
|
||||||
|
|
||||||
AssetBase asset = AssetHelpers.CreateAsset();
|
AssetBase asset = AssetHelpers.CreateNotecardAsset();
|
||||||
asset.ID = TestHelpers.ParseTail(0x2).ToString();
|
asset.ID = TestHelpers.ParseTail(0x2).ToString();
|
||||||
|
|
||||||
m_cache.Store(asset);
|
m_cache.Store(asset);
|
||||||
|
@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
|
||||||
TestHelpers.InMethod();
|
TestHelpers.InMethod();
|
||||||
// log4net.Config.XmlConfigurator.Configure();
|
// log4net.Config.XmlConfigurator.Configure();
|
||||||
|
|
||||||
AssetBase asset = AssetHelpers.CreateAsset();
|
AssetBase asset = AssetHelpers.CreateNotecardAsset();
|
||||||
asset.ID = TestHelpers.ParseTail(0x2).ToString();
|
asset.ID = TestHelpers.ParseTail(0x2).ToString();
|
||||||
|
|
||||||
m_cache.Store(asset);
|
m_cache.Store(asset);
|
||||||
|
|
|
@ -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
|
// We also need to add the texture to the asset service, otherwise the AvatarFactoryModule will tell
|
||||||
// ScenePresence.SendInitialData() to reset our entire appearance.
|
// ScenePresence.SendInitialData() to reset our entire appearance.
|
||||||
scene.AssetService.Store(AssetHelpers.CreateAsset(originalFace8TextureId));
|
scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
|
||||||
|
|
||||||
afm.SetAppearance(sp, originalTe, null);
|
afm.SetAppearance(sp, originalTe, null);
|
||||||
|
|
||||||
|
|
|
@ -40,9 +40,9 @@ namespace OpenSim.Tests.Common
|
||||||
/// Create a notecard asset with a random uuids and dummy text.
|
/// Create a notecard asset with a random uuids and dummy text.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static AssetBase CreateAsset()
|
public static AssetBase CreateNotecardAsset()
|
||||||
{
|
{
|
||||||
return CreateAsset(UUID.Random());
|
return CreateNotecardAsset(UUID.Random());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -50,7 +50,7 @@ namespace OpenSim.Tests.Common
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="creatorId">/param>
|
/// <param name="creatorId">/param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static AssetBase CreateAsset(UUID id)
|
public static AssetBase CreateNotecardAsset(UUID id)
|
||||||
{
|
{
|
||||||
return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random());
|
return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random());
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ namespace OpenSim.Tests.Common
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="creatorId">/param>
|
/// <param name="creatorId">/param>
|
||||||
/// <returns></returns>
|
/// <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);
|
AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId);
|
||||||
scene.AssetService.Store(asset);
|
scene.AssetService.Store(asset);
|
||||||
|
|
|
@ -86,7 +86,7 @@ namespace OpenSim.Tests.Common
|
||||||
AssetBase asset = null;
|
AssetBase asset = null;
|
||||||
|
|
||||||
if (type == InventoryType.Notecard)
|
if (type == InventoryType.Notecard)
|
||||||
asset = AssetHelpers.CreateAsset(scene, userId);
|
asset = AssetHelpers.CreateNotecardAsset(scene, userId);
|
||||||
else if (type == InventoryType.Object)
|
else if (type == InventoryType.Object)
|
||||||
asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
|
asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue