diff options
| author | Dan Lake | 2011-10-03 16:44:32 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-10-03 16:44:32 -0700 |
| commit | 460946ad62b682c7a942751f192ca9e96b662f0e (patch) | |
| tree | 3ea7d72402d5b61221bb2c0bcd5fb9b5e7551d5f /OpenSim/Region/OptionalModules/World/NPC | |
| parent | Remove usage of Linden packet types from inside Attachments Module and interface (diff) | |
| download | opensim-SC_OLD-460946ad62b682c7a942751f192ca9e96b662f0e.zip opensim-SC_OLD-460946ad62b682c7a942751f192ca9e96b662f0e.tar.gz opensim-SC_OLD-460946ad62b682c7a942751f192ca9e96b662f0e.tar.bz2 opensim-SC_OLD-460946ad62b682c7a942751f192ca9e96b662f0e.tar.xz | |
Removed redundant code in AttachmentsModule and simplified interfaces which converted back and forth between ScenePresence and IClientAPI. More to be done still.
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index 1a0d0c7..49c06bc 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | |||
| @@ -132,11 +132,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests | |||
| 132 | UUID attAssetId = TestHelpers.ParseTail(0x3); | 132 | UUID attAssetId = TestHelpers.ParseTail(0x3); |
| 133 | string attName = "att"; | 133 | string attName = "att"; |
| 134 | 134 | ||
| 135 | UserInventoryHelpers.CreateInventoryItem( | 135 | UserInventoryHelpers.CreateInventoryItem(scene, attName, attItemId, attAssetId, sp.UUID, InventoryType.Object); |
| 136 | scene, attName, attItemId, attAssetId, sp.UUID, InventoryType.Object); | ||
| 137 | 136 | ||
| 138 | am.RezSingleAttachmentFromInventory( | 137 | am.RezSingleAttachmentFromInventory(sp, attItemId, (uint)AttachmentPoint.Chest); |
| 139 | sp.ControllingClient, attItemId, (uint)AttachmentPoint.Chest); | ||
| 140 | 138 | ||
| 141 | INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); | 139 | INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); |
| 142 | UUID npcId = npcModule.CreateNPC("John", "Smith", new Vector3(128, 128, 30), scene, sp.Appearance); | 140 | UUID npcId = npcModule.CreateNPC("John", "Smith", new Vector3(128, 128, 30), scene, sp.Appearance); |