aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
authorMelanie2013-01-06 10:52:22 +0000
committerMelanie2013-01-06 10:52:22 +0000
commit083ac92b344262ae72516ba05cc93cdcd2f2a454 (patch)
tree1992de8e08171aac3e811fb1d43abc6ad8b894af /OpenSim/Tests
parentMerge branch 'master' into careminster (diff)
parentbug fix, cleanup... (diff)
downloadopensim-SC-083ac92b344262ae72516ba05cc93cdcd2f2a454.zip
opensim-SC-083ac92b344262ae72516ba05cc93cdcd2f2a454.tar.gz
opensim-SC-083ac92b344262ae72516ba05cc93cdcd2f2a454.tar.bz2
opensim-SC-083ac92b344262ae72516ba05cc93cdcd2f2a454.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r--OpenSim/Tests/Performance/NPCPerformanceTests.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
index 2026a88..fde1b91 100644
--- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs
+++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Tests.Performance
144 // ScenePresence.SendInitialData() to reset our entire appearance. 144 // ScenePresence.SendInitialData() to reset our entire appearance.
145 scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); 145 scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
146 146
147 afm.SetAppearance(sp, originalTe, null); 147 afm.SetAppearance(sp, originalTe, null, new WearableCacheItem[0]);
148 148
149 INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); 149 INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
150 150