Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2013-01-06 10:52:22 +00:00
20 changed files with 1130 additions and 466 deletions

View File

@@ -144,7 +144,7 @@ namespace OpenSim.Tests.Performance
// ScenePresence.SendInitialData() to reset our entire appearance.
scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
afm.SetAppearance(sp, originalTe, null);
afm.SetAppearance(sp, originalTe, null, new WearableCacheItem[0]);
INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();