aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2011-10-25 03:18:29 +0100
committerMelanie2011-10-25 03:18:29 +0100
commit56f3da7b5a1af106b776dee3151cb350abb0e8f8 (patch)
tree40425b2a00e9fda440384cb1c1e48f129e133f03 /OpenSim/Region/OptionalModules/World
parentMerge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge (diff)
parentrefactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss... (diff)
downloadopensim-SC-56f3da7b5a1af106b776dee3151cb350abb0e8f8.zip
opensim-SC-56f3da7b5a1af106b776dee3151cb350abb0e8f8.tar.gz
opensim-SC-56f3da7b5a1af106b776dee3151cb350abb0e8f8.tar.bz2
opensim-SC-56f3da7b5a1af106b776dee3151cb350abb0e8f8.tar.xz
Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs2
1 files changed, 1 insertions, 1 deletions
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