aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
authorMelanie2013-12-11 01:39:56 +0000
committerMelanie2013-12-11 01:39:56 +0000
commit5b73b9c4a85335ba837280688b903fef44be8f35 (patch)
treebd560ec720eb6fbf86b744522b2509071bc31a30 /OpenSim/Tests
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.zip
opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.gz
opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.bz2
opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.xz
Committing the Avination Scene Presence and related texture code
- Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r--OpenSim/Tests/Performance/NPCPerformanceTests.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
index 2026a88..eb09061 100644
--- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs
+++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
@@ -144,6 +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/*
147 afm.SetAppearance(sp, originalTe, null); 148 afm.SetAppearance(sp, originalTe, null);
148 149
149 INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); 150 INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
@@ -185,6 +186,7 @@ namespace OpenSim.Tests.Performance
185 endGcMemory / 1024 / 1024, 186 endGcMemory / 1024 / 1024,
186 startGcMemory / 1024 / 1024, 187 startGcMemory / 1024 / 1024,
187 (endGcMemory - startGcMemory) / 1024 / 1024); 188 (endGcMemory - startGcMemory) / 1024 / 1024);
189*/
188 } 190 }
189 } 191 }
190} \ No newline at end of file 192}