Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge

author: Melanie 2011-10-25 03:16:47 +0100
committer: Melanie 2011-10-25 03:16:47 +0100
commit: 04678836c32d8d639503fb762b46ff499366bd8c (patch)
tree: e6163a94be920589a7f89f96b8491b6b64c25938 /OpenSim/Region/OptionalModules/World/NPC
parent: Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge (diff)
parent: Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... (diff)
download: opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.zip
opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.tar.gz
opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.tar.bz2
opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.tar.xz
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index e94ed85..10181aa 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
            sp.Appearance = npcAppearance;
            scene.AttachmentsModule.RezAttachments(sp);
-            IAvatarFactory module = scene.RequestModuleInterface<IAvatarFactory>();
+            IAvatarFactoryModule module = scene.RequestModuleInterface<IAvatarFactoryModule>();
            module.SendAppearance(sp.UUID);
            return true;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index be1ecd0..ce8d1db 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            // ScenePresence.SendInitialData() to reset our entire appearance.
            scene.AssetService.Store(AssetHelpers.CreateAsset(originalFace8TextureId));
-            afm.SetAppearanceFromClient(sp.ControllingClient, originalTe, null);
+            afm.SetAppearance(sp, originalTe, null);
            INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
            UUID npcId = npcModule.CreateNPC("John", "Smith", new Vector3(128, 128, 30), scene, sp.Appearance);
author	Melanie	2011-10-25 03:16:47 +0100
committer	Melanie	2011-10-25 03:16:47 +0100
commit	04678836c32d8d639503fb762b46ff499366bd8c (patch)
tree	e6163a94be920589a7f89f96b8491b6b64c25938 /OpenSim/Region/OptionalModules/World/NPC
parent	Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge (diff)
parent	Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... (diff)
download	opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.zip opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.tar.gz opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.tar.bz2 opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.tar.xz

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index e94ed85..10181aa 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
84	sp.Appearance = npcAppearance;	84	sp.Appearance = npcAppearance;
85	scene.AttachmentsModule.RezAttachments(sp);	85	scene.AttachmentsModule.RezAttachments(sp);
86		86
87	IAvatarFactory module = scene.RequestModuleInterface<IAvatarFactory>();	87	IAvatarFactoryModule module = scene.RequestModuleInterface<IAvatarFactoryModule>();
88	module.SendAppearance(sp.UUID);	88	module.SendAppearance(sp.UUID);
89		89
90	return true;	90	return true;


diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index be1ecd0..ce8d1db 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
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.CreateAsset(originalFace8TextureId));
108		108
109	afm.SetAppearanceFromClient(sp.ControllingClient, originalTe, null);	109	afm.SetAppearance(sp, originalTe, null);
110		110
111	INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();	111	INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
112	UUID npcId = npcModule.CreateNPC("John", "Smith", new Vector3(128, 128, 30), scene, sp.Appearance);	112	UUID npcId = npcModule.CreateNPC("John", "Smith", new Vector3(128, 128, 30), scene, sp.Appearance);