diff options
author | Justin Clark-Casey (justincc) | 2014-04-02 01:01:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-04-02 01:01:53 +0100 |
commit | 7cb16905898145978c2106149d45d1eac14cc6b9 (patch) | |
tree | 3df5946d5214b334b229d79d144a0222c5a0a2c4 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs | |
parent | Fix problem where moving an object to another region on the same simulator wa... (diff) | |
download | opensim-SC_OLD-7cb16905898145978c2106149d45d1eac14cc6b9.zip opensim-SC_OLD-7cb16905898145978c2106149d45d1eac14cc6b9.tar.gz opensim-SC_OLD-7cb16905898145978c2106149d45d1eac14cc6b9.tar.bz2 opensim-SC_OLD-7cb16905898145978c2106149d45d1eac14cc6b9.tar.xz |
minor: disable logging in recently added scene object crossing tests and remove some unnecessary test config
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs index 43ac558..4d07741 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
64 | public void TestCrossOnSameSimulator() | 64 | public void TestCrossOnSameSimulator() |
65 | { | 65 | { |
66 | TestHelpers.InMethod(); | 66 | TestHelpers.InMethod(); |
67 | TestHelpers.EnableLogging(); | 67 | // TestHelpers.EnableLogging(); |
68 | 68 | ||
69 | UUID userId = TestHelpers.ParseTail(0x1); | 69 | UUID userId = TestHelpers.ParseTail(0x1); |
70 | int sceneObjectIdTail = 0x2; | 70 | int sceneObjectIdTail = 0x2; |
@@ -77,7 +77,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
77 | IConfig modulesConfig = config.AddConfig("Modules"); | 77 | IConfig modulesConfig = config.AddConfig("Modules"); |
78 | modulesConfig.Set("EntityTransferModule", etmA.Name); | 78 | modulesConfig.Set("EntityTransferModule", etmA.Name); |
79 | modulesConfig.Set("SimulationServices", lscm.Name); | 79 | modulesConfig.Set("SimulationServices", lscm.Name); |
80 | // IConfig entityTransferConfig = config.AddConfig("EntityTransfer"); | ||
81 | 80 | ||
82 | SceneHelpers sh = new SceneHelpers(); | 81 | SceneHelpers sh = new SceneHelpers(); |
83 | TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000); | 82 | TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000); |
@@ -109,7 +108,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
109 | public void TestCrossOnSameSimulatorPrimLimitsOkay() | 108 | public void TestCrossOnSameSimulatorPrimLimitsOkay() |
110 | { | 109 | { |
111 | TestHelpers.InMethod(); | 110 | TestHelpers.InMethod(); |
112 | TestHelpers.EnableLogging(); | 111 | // TestHelpers.EnableLogging(); |
113 | 112 | ||
114 | UUID userId = TestHelpers.ParseTail(0x1); | 113 | UUID userId = TestHelpers.ParseTail(0x1); |
115 | int sceneObjectIdTail = 0x2; | 114 | int sceneObjectIdTail = 0x2; |
@@ -125,9 +124,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
125 | modulesConfig.Set("EntityTransferModule", etmA.Name); | 124 | modulesConfig.Set("EntityTransferModule", etmA.Name); |
126 | modulesConfig.Set("SimulationServices", lscm.Name); | 125 | modulesConfig.Set("SimulationServices", lscm.Name); |
127 | 126 | ||
128 | // Remove? | ||
129 | // IConfig entityTransferConfig = config.AddConfig("EntityTransfer"); | ||
130 | |||
131 | IConfig permissionsConfig = config.AddConfig("Permissions"); | 127 | IConfig permissionsConfig = config.AddConfig("Permissions"); |
132 | permissionsConfig.Set("permissionmodules", "PrimLimitsModule"); | 128 | permissionsConfig.Set("permissionmodules", "PrimLimitsModule"); |
133 | 129 | ||