aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-11 21:55:18 +0100
committerJustin Clark-Casey (justincc)2012-07-11 21:55:18 +0100
commit33cff9b9d7c9d742b1cb7064ed78677e3f030e72 (patch)
tree2dafeb5ce7cfe0daba2ccfa35f2e3662c8c8742c /OpenSim/Region/CoreModules
parentRemove WorldComm module from the regression TestCompileAndStartScript() since... (diff)
downloadopensim-SC_OLD-33cff9b9d7c9d742b1cb7064ed78677e3f030e72.zip
opensim-SC_OLD-33cff9b9d7c9d742b1cb7064ed78677e3f030e72.tar.gz
opensim-SC_OLD-33cff9b9d7c9d742b1cb7064ed78677e3f030e72.tar.bz2
opensim-SC_OLD-33cff9b9d7c9d742b1cb7064ed78677e3f030e72.tar.xz
Allow XEngine StartDelay to be configured in the [XEngine] config section.
This is only currently meant for use by regression tests that don't have any issues if XEngine is started up quickly, since no other operations will be occuring simultaneously. Therefore, this is not yet documented externally.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 81e889d..b021a47 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -135,6 +135,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
135 135
136 IConfig xEngineConfig = config.AddConfig("XEngine"); 136 IConfig xEngineConfig = config.AddConfig("XEngine");
137 xEngineConfig.Set("Enabled", "true"); 137 xEngineConfig.Set("Enabled", "true");
138 xEngineConfig.Set("StartDelay", "0");
138 139
139 // These tests will not run with AppDomainLoading = true, at least on mono. For unknown reasons, the call 140 // These tests will not run with AppDomainLoading = true, at least on mono. For unknown reasons, the call
140 // to AssemblyResolver.OnAssemblyResolve fails. 141 // to AssemblyResolver.OnAssemblyResolve fails.
@@ -371,7 +372,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
371 public void TestDetachScriptedAttachmentToInventory() 372 public void TestDetachScriptedAttachmentToInventory()
372 { 373 {
373 TestHelpers.InMethod(); 374 TestHelpers.InMethod();
374 TestHelpers.EnableLogging(); 375// TestHelpers.EnableLogging();
375 376
376 Scene scene = CreateScriptingEnabledTestScene(); 377 Scene scene = CreateScriptingEnabledTestScene();
377 UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1); 378 UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);