From 1388ac2ef7d774b4d25f18d237fdad89d7ac43ac Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 12 Dec 2016 11:09:38 +0000
Subject: Rename charterMember to membershipType to show what it actually is.
 This field started out as a simple flag in the protocol to indicate a user
 being a SL charter member. It has since then taken on additional
 functionality that means that the name is no longer appropriate.

---
 OpenSim/Tests/Common/Mock/TestClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Tests/Common')

diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 9251c4f..f407e5a 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -990,7 +990,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
+        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] membershipType,
                                          string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL,
                                          UUID partnerID)
         {
-- 
cgit v1.1


From 69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 13 Dec 2016 19:47:26 +0000
Subject: 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.

---
 OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs | 4 ++--
 OpenSim/Tests/Common/Mock/TestLLUDPServer.cs       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Tests/Common')

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
             uint port = 0;
             AgentCircuitManager acm = scene.AuthenticateHandler;
 
-            TestLLUDPServer udpServer = new TestLLUDPServer(IPAddress.Any, ref port, 0, false, configSource, acm);
+            TestLLUDPServer udpServer = new TestLLUDPServer(IPAddress.Any, ref port, 0, configSource, acm);
             udpServer.AddScene(scene);
 
             return udpServer;
         }
     }
-}
\ No newline at end of file
+}
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
     {
         public List<Packet> PacketsSent { get; private set; }
 
-        public TestLLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager)
-            : base(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager)
+        public TestLLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, IConfigSource configSource, AgentCircuitManager circuitManager)
+            : base(listenIP, ref port, proxyPortOffsetParm, configSource, circuitManager)
         {
             PacketsSent = new List<Packet>();
         }
-- 
cgit v1.1