diff options
author | Justin Clark-Casey (justincc) | 2011-10-22 00:13:46 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-22 00:13:46 +0100 |
commit | 9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0 (patch) | |
tree | edaf907442c015451195ccc6c396f9376e6a24a5 | |
parent | RemoteAdmin - Added optional terrain loading on region create using parameter... (diff) | |
download | opensim-SC-9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0.zip opensim-SC-9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0.tar.gz opensim-SC-9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0.tar.bz2 opensim-SC-9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0.tar.xz |
refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAsset()
Diffstat (limited to '')
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 | |||
75 | TestHelpers.InMethod(); | 75 | TestHelpers.InMethod(); |
76 | // log4net.Config.XmlConfigurator.Configure(); | 76 | // log4net.Config.XmlConfigurator.Configure(); |
77 | 77 | ||
78 | AssetBase asset = AssetHelpers.CreateAsset(); | 78 | AssetBase asset = AssetHelpers.CreateNotecardAsset(); |
79 | asset.ID = TestHelpers.ParseTail(0x1).ToString(); | 79 | asset.ID = TestHelpers.ParseTail(0x1).ToString(); |
80 | 80 | ||
81 | // Check we don't get anything before the asset is put in the cache | 81 | // Check we don't get anything before the asset is put in the cache |
@@ -96,7 +96,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests | |||
96 | TestHelpers.InMethod(); | 96 | TestHelpers.InMethod(); |
97 | // log4net.Config.XmlConfigurator.Configure(); | 97 | // log4net.Config.XmlConfigurator.Configure(); |
98 | 98 | ||
99 | AssetBase asset = AssetHelpers.CreateAsset(); | 99 | AssetBase asset = AssetHelpers.CreateNotecardAsset(); |
100 | asset.ID = TestHelpers.ParseTail(0x2).ToString(); | 100 | asset.ID = TestHelpers.ParseTail(0x2).ToString(); |
101 | 101 | ||
102 | m_cache.Store(asset); | 102 | m_cache.Store(asset); |
@@ -112,8 +112,8 @@ namespace OpenSim.Region.CoreModules.Asset.Tests | |||
112 | { | 112 | { |
113 | TestHelpers.InMethod(); | 113 | TestHelpers.InMethod(); |
114 | // log4net.Config.XmlConfigurator.Configure(); | 114 | // log4net.Config.XmlConfigurator.Configure(); |
115 | 115 | ||
116 | AssetBase asset = AssetHelpers.CreateAsset(); | 116 | AssetBase asset = AssetHelpers.CreateNotecardAsset(); |
117 | asset.ID = TestHelpers.ParseTail(0x2).ToString(); | 117 | asset.ID = TestHelpers.ParseTail(0x2).ToString(); |
118 | 118 | ||
119 | m_cache.Store(asset); | 119 | 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 | |||
104 | 104 | ||
105 | // We also need to add the texture to the asset service, otherwise the AvatarFactoryModule will tell | 105 | // We also need to add the texture to the asset service, otherwise the AvatarFactoryModule will tell |
106 | // ScenePresence.SendInitialData() to reset our entire appearance. | 106 | // ScenePresence.SendInitialData() to reset our entire appearance. |
107 | scene.AssetService.Store(AssetHelpers.CreateAsset(originalFace8TextureId)); | 107 | scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); |
108 | 108 | ||
109 | afm.SetAppearance(sp, originalTe, null); | 109 | afm.SetAppearance(sp, originalTe, null); |
110 | 110 | ||
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 | |||
40 | /// Create a notecard asset with a random uuids and dummy text. | 40 | /// Create a notecard asset with a random uuids and dummy text. |
41 | /// </summary> | 41 | /// </summary> |
42 | /// <returns></returns> | 42 | /// <returns></returns> |
43 | public static AssetBase CreateAsset() | 43 | public static AssetBase CreateNotecardAsset() |
44 | { | 44 | { |
45 | return CreateAsset(UUID.Random()); | 45 | return CreateNotecardAsset(UUID.Random()); |
46 | } | 46 | } |
47 | 47 | ||
48 | /// <summary> | 48 | /// <summary> |
@@ -50,7 +50,7 @@ namespace OpenSim.Tests.Common | |||
50 | /// </summary> | 50 | /// </summary> |
51 | /// <param name="creatorId">/param> | 51 | /// <param name="creatorId">/param> |
52 | /// <returns></returns> | 52 | /// <returns></returns> |
53 | public static AssetBase CreateAsset(UUID id) | 53 | public static AssetBase CreateNotecardAsset(UUID id) |
54 | { | 54 | { |
55 | return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random()); | 55 | return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random()); |
56 | } | 56 | } |
@@ -60,7 +60,7 @@ namespace OpenSim.Tests.Common | |||
60 | /// </summary> | 60 | /// </summary> |
61 | /// <param name="creatorId">/param> | 61 | /// <param name="creatorId">/param> |
62 | /// <returns></returns> | 62 | /// <returns></returns> |
63 | public static AssetBase CreateAsset(Scene scene, UUID creatorId) | 63 | public static AssetBase CreateNotecardAsset(Scene scene, UUID creatorId) |
64 | { | 64 | { |
65 | AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); | 65 | AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); |
66 | scene.AssetService.Store(asset); | 66 | 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 | |||
86 | AssetBase asset = null; | 86 | AssetBase asset = null; |
87 | 87 | ||
88 | if (type == InventoryType.Notecard) | 88 | if (type == InventoryType.Notecard) |
89 | asset = AssetHelpers.CreateAsset(scene, userId); | 89 | asset = AssetHelpers.CreateNotecardAsset(scene, userId); |
90 | else if (type == InventoryType.Object) | 90 | else if (type == InventoryType.Object) |
91 | asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId)); | 91 | asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId)); |
92 | else | 92 | else |