mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 17:05:55 +08:00
bad merge?
This commit is contained in:
@@ -113,7 +113,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
|
||||
// ScenePresence.SendInitialData() to reset our entire appearance.
|
||||
m_scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
|
||||
|
||||
m_afMod.SetAppearance(sp, originalTe, null, null);
|
||||
m_afMod.SetAppearance(sp, originalTe, null, new WearableCacheItem[0] );
|
||||
|
||||
UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance);
|
||||
|
||||
@@ -484,4 +484,4 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
|
||||
Assert.That(npc.ParentID, Is.EqualTo(0));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user