aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs9
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs5
2 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 4979be8..b7469ae 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -823,12 +823,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
823 handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType); 823 handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
824 handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; 824 handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
825 825
826 handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0]; 826 handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[1];
827// OutPacket(handshake, ThrottleOutPacketType.Task); 827 handshake.RegionInfo4[0] = new RegionHandshakePacket.RegionInfo4Block();
828 // use same as MoveAgentIntoRegion (both should be task ) 828 handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
829 handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
830
829 OutPacket(handshake, ThrottleOutPacketType.Unknown); 831 OutPacket(handshake, ThrottleOutPacketType.Unknown);
830 } 832 }
831 833
834
832 public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) 835 public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
833 { 836 {
834 AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete); 837 AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index e07ce4c..33ca08c 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
62 m_udpServer = new LLUDPServer(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager); 62 m_udpServer = new LLUDPServer(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager);
63 } 63 }
64 64
65 public void NetworkStop()
66 {
67 m_udpServer.Stop();
68 }
69
70 public void AddScene(IScene scene) 65 public void AddScene(IScene scene)
71 { 66 {
72 m_udpServer.AddScene(scene); 67 m_udpServer.AddScene(scene);