diff options
author | Robert Adams | 2013-12-17 06:18:13 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-17 06:18:13 -0800 |
commit | 6937eec2588fab5e73c3ddc74c4ddc1bb35e7527 (patch) | |
tree | 4372b6dfa7f2e277312c0547a099f6ffeea6e91f /OpenSim/Tests/Performance/NPCPerformanceTests.cs | |
parent | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. (diff) | |
parent | Fix issue with editing notes for other avatars (diff) | |
download | opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.zip opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.gz opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.bz2 opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.xz |
Merge branch 'master' into varregion
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Tests/Performance/NPCPerformanceTests.cs')
-rw-r--r-- | OpenSim/Tests/Performance/NPCPerformanceTests.cs | 4 |
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 | } |