aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authorMelanie Thielker2016-12-13 19:47:26 +0000
committerMelanie Thielker2016-12-13 19:47:26 +0000
commit69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3 (patch)
tree1db4aedc7bda9ce15f5be133c3514517ca0f312b /OpenSim/Tests/Common
parentMake sure sims on Linux can be restarted without waiting on a 2 mintue socket... (diff)
downloadopensim-SC_OLD-69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3.zip
opensim-SC_OLD-69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3.tar.gz
opensim-SC_OLD-69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3.tar.bz2
opensim-SC_OLD-69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3.tar.xz
Remove the AllowAlternatePorts option. It wasn't implemented anyway.
Instead, handle the port being 0 as "any port" and assign a random port for regions in that case.
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs4
-rw-r--r--OpenSim/Tests/Common/Mock/TestLLUDPServer.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs b/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs
index 33cd8a2..df9f6f2 100644
--- a/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs
@@ -86,10 +86,10 @@ namespace OpenSim.Tests.Common
86 uint port = 0; 86 uint port = 0;
87 AgentCircuitManager acm = scene.AuthenticateHandler; 87 AgentCircuitManager acm = scene.AuthenticateHandler;
88 88
89 TestLLUDPServer udpServer = new TestLLUDPServer(IPAddress.Any, ref port, 0, false, configSource, acm); 89 TestLLUDPServer udpServer = new TestLLUDPServer(IPAddress.Any, ref port, 0, configSource, acm);
90 udpServer.AddScene(scene); 90 udpServer.AddScene(scene);
91 91
92 return udpServer; 92 return udpServer;
93 } 93 }
94 } 94 }
95} \ No newline at end of file 95}
diff --git a/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs b/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs
index 26887c9..b2c6a8c 100644
--- a/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs
+++ b/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs
@@ -43,8 +43,8 @@ namespace OpenSim.Tests.Common
43 { 43 {
44 public List<Packet> PacketsSent { get; private set; } 44 public List<Packet> PacketsSent { get; private set; }
45 45
46 public TestLLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager) 46 public TestLLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, IConfigSource configSource, AgentCircuitManager circuitManager)
47 : base(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager) 47 : base(listenIP, ref port, proxyPortOffsetParm, configSource, circuitManager)
48 { 48 {
49 PacketsSent = new List<Packet>(); 49 PacketsSent = new List<Packet>();
50 } 50 }