diff options
| author | UbitUmarov | 2016-12-23 02:53:58 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-23 02:53:58 +0000 |
| commit | 86cc02f33e3c9a4a9c42eb1aaaaeaa828bee1b55 (patch) | |
| tree | d61a1b20e0bd05f4b784c299f8e220608c9bcb34 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue | |
| parent | update httpserver muting some socket errors that are normal (diff) | |
| parent | UserProfileModule threading issues (diff) | |
| download | opensim-SC-86cc02f33e3c9a4a9c42eb1aaaaeaa828bee1b55.zip opensim-SC-86cc02f33e3c9a4a9c42eb1aaaaeaa828bee1b55.tar.gz opensim-SC-86cc02f33e3c9a4a9c42eb1aaaaeaa828bee1b55.tar.bz2 opensim-SC-86cc02f33e3c9a4a9c42eb1aaaaeaa828bee1b55.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs index 54af246..86aeae8 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs | |||
| @@ -70,7 +70,6 @@ namespace OpenSim.Region.ClientStack.Linden.Tests | |||
| 70 | 70 | ||
| 71 | IConfigSource config = new IniConfigSource(); | 71 | IConfigSource config = new IniConfigSource(); |
| 72 | config.AddConfig("Startup"); | 72 | config.AddConfig("Startup"); |
| 73 | config.Configs["Startup"].Set("EventQueue", "true"); | ||
| 74 | 73 | ||
| 75 | CapabilitiesModule capsModule = new CapabilitiesModule(); | 74 | CapabilitiesModule capsModule = new CapabilitiesModule(); |
| 76 | m_eqgMod = new EventQueueGetModule(); | 75 | m_eqgMod = new EventQueueGetModule(); |
| @@ -195,4 +194,4 @@ namespace OpenSim.Region.ClientStack.Linden.Tests | |||
| 195 | Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.BadGateway)); | 194 | Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.BadGateway)); |
| 196 | } | 195 | } |
| 197 | } | 196 | } |
| 198 | } \ No newline at end of file | 197 | } |