diff options
author | dahlia | 2013-04-17 23:10:02 -0700 |
---|---|---|
committer | dahlia | 2013-04-17 23:10:02 -0700 |
commit | 53122fad400e2d5bac5f02a3e153b6e76c9112b3 (patch) | |
tree | 49128447fbb25b868cc9dd04df23f7d156040534 /OpenSim/Region/ClientStack | |
parent | Allow changes to TextureEntry to propagate to viewers when MaterialID changes (diff) | |
download | opensim-SC_OLD-53122fad400e2d5bac5f02a3e153b6e76c9112b3.zip opensim-SC_OLD-53122fad400e2d5bac5f02a3e153b6e76c9112b3.tar.gz opensim-SC_OLD-53122fad400e2d5bac5f02a3e153b6e76c9112b3.tar.bz2 opensim-SC_OLD-53122fad400e2d5bac5f02a3e153b6e76c9112b3.tar.xz |
Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential crash with Server-side baking enabled viewers
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 |
1 files changed, 6 insertions, 2 deletions
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 | |||
791 | handshake.RegionInfo3.ColoName = Utils.EmptyBytes; | 791 | handshake.RegionInfo3.ColoName = Utils.EmptyBytes; |
792 | handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType); | 792 | handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType); |
793 | handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; | 793 | handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; |
794 | handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0]; | 794 | |
795 | 795 | handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[1]; | |
796 | handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags; | ||
797 | handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported | ||
798 | |||
796 | OutPacket(handshake, ThrottleOutPacketType.Task); | 799 | OutPacket(handshake, ThrottleOutPacketType.Task); |
797 | } | 800 | } |
798 | 801 | ||
802 | |||
799 | public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) | 803 | public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) |
800 | { | 804 | { |
801 | AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete); | 805 | AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete); |