diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Tests/Performance | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Tests/Performance')
| -rw-r--r-- | OpenSim/Tests/Performance/NPCPerformanceTests.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs index e222dc2..747c992 100644 --- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs +++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs | |||
| @@ -143,8 +143,7 @@ namespace OpenSim.Tests.Performance | |||
| 143 | // ScenePresence.SendInitialData() to reset our entire appearance. | 143 | // ScenePresence.SendInitialData() to reset our entire appearance. |
| 144 | scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); | 144 | scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); |
| 145 | 145 | ||
| 146 | /* | 146 | afm.SetAppearance(sp, originalTe, null, new WearableCacheItem[0]); |
| 147 | afm.SetAppearance(sp, originalTe, null); | ||
| 148 | 147 | ||
| 149 | INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); | 148 | INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); |
| 150 | 149 | ||
| @@ -185,7 +184,6 @@ namespace OpenSim.Tests.Performance | |||
| 185 | endGcMemory / 1024 / 1024, | 184 | endGcMemory / 1024 / 1024, |
| 186 | startGcMemory / 1024 / 1024, | 185 | startGcMemory / 1024 / 1024, |
| 187 | (endGcMemory - startGcMemory) / 1024 / 1024); | 186 | (endGcMemory - startGcMemory) / 1024 / 1024); |
| 188 | */ | ||
| 189 | } | 187 | } |
| 190 | } | 188 | } |
| 191 | } | 189 | } |