aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs1
-rw-r--r--OpenSim/Tools/Configger/ConfigurationLoader.cs2
4 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 522fe0e..4f141a6 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -352,8 +352,6 @@ namespace OpenSim
352 config.Set("shutdown_console_commands_file", String.Empty); 352 config.Set("shutdown_console_commands_file", String.Empty);
353 config.Set("DefaultScriptEngine", "XEngine"); 353 config.Set("DefaultScriptEngine", "XEngine");
354 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 354 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
355 // life doesn't really work without this
356 config.Set("EventQueue", true);
357 } 355 }
358 356
359 { 357 {
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index 5eb4452..1e629bd 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -71,7 +71,6 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
71 71
72 IConfigSource config = new IniConfigSource(); 72 IConfigSource config = new IniConfigSource();
73 config.AddConfig("Startup"); 73 config.AddConfig("Startup");
74 config.Configs["Startup"].Set("EventQueue", "true");
75 74
76 CapabilitiesModule capsModule = new CapabilitiesModule(); 75 CapabilitiesModule capsModule = new CapabilitiesModule();
77 m_eqgMod = new EventQueueGetModule(); 76 m_eqgMod = new EventQueueGetModule();
@@ -196,4 +195,4 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
196 Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.BadGateway)); 195 Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.BadGateway));
197 } 196 }
198 } 197 }
199} \ No newline at end of file 198}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index 568cd34..ada407f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -271,7 +271,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests
271 IConfigSource configSource = new IniConfigSource(); 271 IConfigSource configSource = new IniConfigSource();
272 IConfig config = configSource.AddConfig("Startup"); 272 IConfig config = configSource.AddConfig("Startup");
273 config.Set("serverside_object_permissions", true); 273 config.Set("serverside_object_permissions", true);
274 config.Set("EventQueue", true);
275 274
276 EntityTransferModule etm = new EntityTransferModule(); 275 EntityTransferModule etm = new EntityTransferModule();
277 276
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index aba7e64..fa3a5bf 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -272,8 +272,6 @@ namespace OpenSim.Tools.Configger
272 config.Set("shutdown_console_commands_file", String.Empty); 272 config.Set("shutdown_console_commands_file", String.Empty);
273 config.Set("DefaultScriptEngine", "XEngine"); 273 config.Set("DefaultScriptEngine", "XEngine");
274 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 274 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
275 // life doesn't really work without this
276 config.Set("EventQueue", true);
277 } 275 }
278 276
279 return defaultConfig; 277 return defaultConfig;