diff options
author | Dan Lake | 2011-10-19 14:41:44 -0700 |
---|---|---|
committer | Dan Lake | 2011-10-19 14:41:44 -0700 |
commit | da794f34a56f7c88904315ae538de8f3790e6891 (patch) | |
tree | ec15f9ad1a941441ab2c0cd24f50b7636bba7bce /OpenSim/Region/OptionalModules/World/NPC | |
parent | Add "scripts stop" and "scripts start" console commands. (diff) | |
download | opensim-SC_OLD-da794f34a56f7c88904315ae538de8f3790e6891.zip opensim-SC_OLD-da794f34a56f7c88904315ae538de8f3790e6891.tar.gz opensim-SC_OLD-da794f34a56f7c88904315ae538de8f3790e6891.tar.bz2 opensim-SC_OLD-da794f34a56f7c88904315ae538de8f3790e6891.tar.xz |
Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of scene presence by client ID.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 2 |
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 | |||
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); |