diff options
author | Melanie | 2013-03-13 02:02:46 +0000 |
---|---|---|
committer | Melanie | 2013-03-13 02:02:46 +0000 |
commit | 710381e838f842963cdc4d22fe9bdc1a30c3d745 (patch) | |
tree | c16c3e223b7bdc574de33f8651cc13ff46235416 /OpenSim/Region/ClientStack/Linden/Caps | |
parent | Merge branch 'master' into careminster (diff) | |
parent | minor: save some commented out log lines which will be useful again in future... (diff) | |
download | opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.zip opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.tar.gz opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.tar.bz2 opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs index ed8ec16..141af8a 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs | |||
@@ -49,8 +49,10 @@ namespace OpenSim.Region.ClientStack.Linden.Tests | |||
49 | private TestScene m_scene; | 49 | private TestScene m_scene; |
50 | 50 | ||
51 | [SetUp] | 51 | [SetUp] |
52 | public void SetUp() | 52 | public override void SetUp() |
53 | { | 53 | { |
54 | base.SetUp(); | ||
55 | |||
54 | uint port = 9999; | 56 | uint port = 9999; |
55 | uint sslPort = 9998; | 57 | uint sslPort = 9998; |
56 | 58 | ||