aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2011-10-25 01:37:11 +0100
committerMelanie2011-10-25 01:37:11 +0100
commit9ceb98344a8a296994404edaf86b4344e06b9a69 (patch)
tree3efe288d54152c6b6b8c24e763495c1eddf62d4e /OpenSim/Region/ClientStack
parentMerge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge (diff)
parentGet rid of some traces of the old pre-ROBUST grid architecture config (diff)
downloadopensim-SC_OLD-9ceb98344a8a296994404edaf86b4344e06b9a69.zip
opensim-SC_OLD-9ceb98344a8a296994404edaf86b4344e06b9a69.tar.gz
opensim-SC_OLD-9ceb98344a8a296994404edaf86b4344e06b9a69.tar.bz2
opensim-SC_OLD-9ceb98344a8a296994404edaf86b4344e06b9a69.tar.xz
Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index b8a4e8e..9d37cdf 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
147// /// <summary> 147// /// <summary>
148// /// Test adding a client to the stack 148// /// Test adding a client to the stack
149// /// </summary> 149// /// </summary>
150// [Test, LongRunning] 150// [Test]
151// public void TestAddClient() 151// public void TestAddClient()
152// { 152// {
153// TestHelper.InMethod(); 153// TestHelper.InMethod();