From da794f34a56f7c88904315ae538de8f3790e6891 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Wed, 19 Oct 2011 14:41:44 -0700
Subject: Renamed and rearranged AvatarFactoryModule to eliminate redundant
 lookups of scene presence by client ID.

---
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs            | 2 +-
 OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/World')

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);
-- 
cgit v1.1