From c5de9840b05514eb659696239593e51e636398b8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 16 Apr 2013 21:58:24 +0100
Subject: refactor: Remove IClientNetworkServer.NetworkStop() in favour of
 existing Stop().

This was an undocumented interface which I think was for long defunct region load balancing experiments.
Also adds method doc for some IClientNetworkServer methods.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'OpenSim/Region/ClientStack/Linden')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 72516cd..985aa4d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -62,11 +62,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_udpServer = new LLUDPServer(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager);
         }
 
-        public void NetworkStop()
-        {
-            m_udpServer.Stop();
-        }
-
         public void AddScene(IScene scene)
         {
             m_udpServer.AddScene(scene);
-- 
cgit v1.1


From 53122fad400e2d5bac5f02a3e153b6e76c9112b3 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 17 Apr 2013 23:10:02 -0700
Subject: Thanks lkalif for a fix to SendRegionHandshake() which fixes a
 potential crash with Server-side baking enabled viewers

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/ClientStack/Linden')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 110e50e..02b326e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -791,11 +791,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo3.ColoName = Utils.EmptyBytes;
             handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
             handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
-            handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0];
-            
+
+            handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[1];
+            handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
+            handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
+
             OutPacket(handshake, ThrottleOutPacketType.Task);
         }
 
+
         public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
         {
             AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
-- 
cgit v1.1


From 7c839f176fab8166d4787ddbdffdda5f8d9e55ca Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 17 Apr 2013 23:14:28 -0700
Subject: amend previous commit, a line was left out

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/ClientStack/Linden')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 02b326e..1609012 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -793,6 +793,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
 
             handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[1];
+            handshake.RegionInfo4[0] = new RegionHandshakePacket.RegionInfo4Block();
             handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
             handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
 
-- 
cgit v1.1