aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-22 00:13:46 +0100
committerJustin Clark-Casey (justincc)2011-10-22 00:13:46 +0100
commit9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0 (patch)
treeedaf907442c015451195ccc6c396f9376e6a24a5 /OpenSim/Region
parentRemoteAdmin - Added optional terrain loading on region create using parameter... (diff)
downloadopensim-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 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs8
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs2
2 files changed, 5 insertions, 5 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