diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Tests/Performance | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to 'OpenSim/Tests/Performance')
-rw-r--r-- | OpenSim/Tests/Performance/NPCPerformanceTests.cs | 7 | ||||
-rw-r--r-- | OpenSim/Tests/Performance/ObjectPerformanceTests.cs | 1 | ||||
-rw-r--r-- | OpenSim/Tests/Performance/ScriptPerformanceTests.cs | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs index 2026a88..ca6ae42 100644 --- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs +++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs | |||
@@ -34,7 +34,7 @@ using Nini.Config; | |||
34 | using NUnit.Framework; | 34 | using NUnit.Framework; |
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications; | 37 | |
38 | using OpenSim.Region.CoreModules.Avatar.Attachments; | 38 | using OpenSim.Region.CoreModules.Avatar.Attachments; |
39 | using OpenSim.Region.CoreModules.Avatar.AvatarFactory; | 39 | using OpenSim.Region.CoreModules.Avatar.AvatarFactory; |
40 | using OpenSim.Region.CoreModules.Framework.InventoryAccess; | 40 | using OpenSim.Region.CoreModules.Framework.InventoryAccess; |
@@ -45,7 +45,6 @@ using OpenSim.Region.Framework.Scenes; | |||
45 | using OpenSim.Region.OptionalModules.World.NPC; | 45 | using OpenSim.Region.OptionalModules.World.NPC; |
46 | using OpenSim.Services.AvatarService; | 46 | using OpenSim.Services.AvatarService; |
47 | using OpenSim.Tests.Common; | 47 | using OpenSim.Tests.Common; |
48 | using OpenSim.Tests.Common.Mock; | ||
49 | 48 | ||
50 | namespace OpenSim.Tests.Performance | 49 | namespace OpenSim.Tests.Performance |
51 | { | 50 | { |
@@ -144,6 +143,7 @@ namespace OpenSim.Tests.Performance | |||
144 | // ScenePresence.SendInitialData() to reset our entire appearance. | 143 | // ScenePresence.SendInitialData() to reset our entire appearance. |
145 | scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); | 144 | scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); |
146 | 145 | ||
146 | /* | ||
147 | afm.SetAppearance(sp, originalTe, null); | 147 | afm.SetAppearance(sp, originalTe, null); |
148 | 148 | ||
149 | INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); | 149 | INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); |
@@ -185,6 +185,7 @@ namespace OpenSim.Tests.Performance | |||
185 | endGcMemory / 1024 / 1024, | 185 | endGcMemory / 1024 / 1024, |
186 | startGcMemory / 1024 / 1024, | 186 | startGcMemory / 1024 / 1024, |
187 | (endGcMemory - startGcMemory) / 1024 / 1024); | 187 | (endGcMemory - startGcMemory) / 1024 / 1024); |
188 | */ | ||
188 | } | 189 | } |
189 | } | 190 | } |
190 | } \ No newline at end of file | 191 | } |
diff --git a/OpenSim/Tests/Performance/ObjectPerformanceTests.cs b/OpenSim/Tests/Performance/ObjectPerformanceTests.cs index 656a971..9dad423 100644 --- a/OpenSim/Tests/Performance/ObjectPerformanceTests.cs +++ b/OpenSim/Tests/Performance/ObjectPerformanceTests.cs | |||
@@ -34,7 +34,6 @@ using OpenMetaverse; | |||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Tests.Common; | 36 | using OpenSim.Tests.Common; |
37 | using OpenSim.Tests.Common.Mock; | ||
38 | 37 | ||
39 | namespace OpenSim.Tests.Performance | 38 | namespace OpenSim.Tests.Performance |
40 | { | 39 | { |
diff --git a/OpenSim/Tests/Performance/ScriptPerformanceTests.cs b/OpenSim/Tests/Performance/ScriptPerformanceTests.cs index 4064edc..028f4b0 100644 --- a/OpenSim/Tests/Performance/ScriptPerformanceTests.cs +++ b/OpenSim/Tests/Performance/ScriptPerformanceTests.cs | |||
@@ -40,7 +40,6 @@ using OpenSim.Region.Framework.Interfaces; | |||
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using OpenSim.Region.ScriptEngine.XEngine; | 41 | using OpenSim.Region.ScriptEngine.XEngine; |
42 | using OpenSim.Tests.Common; | 42 | using OpenSim.Tests.Common; |
43 | using OpenSim.Tests.Common.Mock; | ||
44 | 43 | ||
45 | namespace OpenSim.Tests.Performance | 44 | namespace OpenSim.Tests.Performance |
46 | { | 45 | { |