diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rwxr-xr-x | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 24 | ||||
-rwxr-xr-x | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 |
2 files changed, 18 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index c395890..645d00b 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -3037,9 +3037,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3037 | public void SendAlertMessage(string message) | 3037 | public void SendAlertMessage(string message) |
3038 | { | 3038 | { |
3039 | AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage); | 3039 | AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage); |
3040 | alertPack.AgentInfo = new AlertMessagePacket.AgentInfoBlock[1]; | 3040 | //alertPack.AgentInfo = new AlertMessagePacket.AgentInfoBlock[1]; |
3041 | alertPack.AgentInfo[0] = new AlertMessagePacket.AgentInfoBlock(); | 3041 | //alertPack.AgentInfo[0] = new AlertMessagePacket.AgentInfoBlock(); |
3042 | alertPack.AgentInfo[0].AgentID = AgentId; | 3042 | //alertPack.AgentInfo[0].AgentID = AgentId; |
3043 | alertPack.AlertData = new AlertMessagePacket.AlertDataBlock(); | 3043 | alertPack.AlertData = new AlertMessagePacket.AlertDataBlock(); |
3044 | alertPack.AlertData.Message = Util.StringToBytes256(message); | 3044 | alertPack.AlertData.Message = Util.StringToBytes256(message); |
3045 | alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[0]; | 3045 | alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[0]; |
@@ -3049,9 +3049,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3049 | public void SendAlertMessage(string message, string info) | 3049 | public void SendAlertMessage(string message, string info) |
3050 | { | 3050 | { |
3051 | AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage); | 3051 | AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage); |
3052 | alertPack.AgentInfo = new AlertMessagePacket.AgentInfoBlock[1]; | 3052 | //alertPack.AgentInfo = new AlertMessagePacket.AgentInfoBlock[1]; |
3053 | alertPack.AgentInfo[0] = new AlertMessagePacket.AgentInfoBlock(); | 3053 | //alertPack.AgentInfo[0] = new AlertMessagePacket.AgentInfoBlock(); |
3054 | alertPack.AgentInfo[0].AgentID = AgentId; | 3054 | //alertPack.AgentInfo[0].AgentID = AgentId; |
3055 | alertPack.AlertData = new AlertMessagePacket.AlertDataBlock(); | 3055 | alertPack.AlertData = new AlertMessagePacket.AlertDataBlock(); |
3056 | alertPack.AlertData.Message = Util.StringToBytes256(message); | 3056 | alertPack.AlertData.Message = Util.StringToBytes256(message); |
3057 | alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[1]; | 3057 | alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[1]; |
@@ -6591,6 +6591,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6591 | 6591 | ||
6592 | LLSDxmlEncode.AddEndMapAndArray(sb); | 6592 | LLSDxmlEncode.AddEndMapAndArray(sb); |
6593 | 6593 | ||
6594 | LLSDxmlEncode.AddArrayAndMap("ParcelEnvironmentBlock", sb); | ||
6595 | LLSDxmlEncode.AddElem("ParcelEnvironmentVersion", -1, sb); | ||
6596 | LLSDxmlEncode.AddElem("RegionAllowEnvironmentOverride", false, sb); | ||
6597 | LLSDxmlEncode.AddEndMapAndArray(sb); | ||
6598 | |||
6599 | bool accessovr = Scene.RegionInfo.EstateSettings.TaxFree; | ||
6600 | LLSDxmlEncode.AddArrayAndMap("RegionAllowAccessBlock", sb); | ||
6601 | LLSDxmlEncode.AddElem("RegionAllowAccessOverride", accessovr, sb); | ||
6602 | LLSDxmlEncode.AddEndMapAndArray(sb); | ||
6594 | OSDllsdxml ev = new OSDllsdxml(eq.EndEvent(sb)); | 6603 | OSDllsdxml ev = new OSDllsdxml(eq.EndEvent(sb)); |
6595 | eq.Enqueue(ev, AgentId); | 6604 | eq.Enqueue(ev, AgentId); |
6596 | 6605 | ||
@@ -15437,7 +15446,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
15437 | } | 15446 | } |
15438 | } | 15447 | } |
15439 | } | 15448 | } |
15440 | return ret; // ??? | 15449 | |
15450 | return ret; | ||
15441 | } | 15451 | } |
15442 | } | 15452 | } |
15443 | } | 15453 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index e313934..2863b8d 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1172,7 +1172,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1172 | int dataLength = buffer.DataLength; | 1172 | int dataLength = buffer.DataLength; |
1173 | 1173 | ||
1174 | // only append acks on plain reliable messages | 1174 | // only append acks on plain reliable messages |
1175 | if (flags == Helpers.MSG_RELIABLE && outgoingPacket.UnackedMethod == null) | 1175 | if (flags == Helpers.MSG_RELIABLE) |
1176 | { | 1176 | { |
1177 | // Keep appending ACKs until there is no room left in the buffer or there are | 1177 | // Keep appending ACKs until there is no room left in the buffer or there are |
1178 | // no more ACKs to append | 1178 | // no more ACKs to append |