diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 12e9d4d..bae41fb 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -897,32 +897,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
897 | msg.MessageBlock.Message = Util.StringToBytes1024(im.message); | 897 | msg.MessageBlock.Message = Util.StringToBytes1024(im.message); |
898 | msg.MessageBlock.BinaryBucket = im.binaryBucket; | 898 | msg.MessageBlock.BinaryBucket = im.binaryBucket; |
899 | 899 | ||
900 | if (im.message.StartsWith("[grouptest]")) | 900 | OutPacket(msg, ThrottleOutPacketType.Task); |
901 | { // this block is test code for implementing group IM - delete when group IM is finished | ||
902 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); | ||
903 | if (eq != null) | ||
904 | { | ||
905 | im.dialog = 17; | ||
906 | |||
907 | //eq.ChatterboxInvitation( | ||
908 | // new UUID("00000000-68f9-1111-024e-222222111123"), | ||
909 | // "OpenSimulator Testing", im.fromAgentID, im.message, im.toAgentID, im.fromAgentName, im.dialog, 0, | ||
910 | // false, 0, new Vector3(), 1, im.imSessionID, im.fromGroup, im.binaryBucket); | ||
911 | |||
912 | eq.ChatterboxInvitation( | ||
913 | new UUID("00000000-68f9-1111-024e-222222111123"), | ||
914 | "OpenSimulator Testing", new UUID(im.fromAgentID), im.message, new UUID(im.toAgentID), im.fromAgentName, im.dialog, 0, | ||
915 | false, 0, new Vector3(), 1, new UUID(im.imSessionID), im.fromGroup, Util.StringToBytes256("OpenSimulator Testing")); | ||
916 | |||
917 | eq.ChatterBoxSessionAgentListUpdates( | ||
918 | new UUID("00000000-68f9-1111-024e-222222111123"), | ||
919 | new UUID(im.fromAgentID), new UUID(im.toAgentID), false, false, false); | ||
920 | } | ||
921 | |||
922 | Console.WriteLine("SendInstantMessage: " + msg); | ||
923 | } | ||
924 | else | ||
925 | OutPacket(msg, ThrottleOutPacketType.Task); | ||
926 | } | 901 | } |
927 | } | 902 | } |
928 | 903 | ||
@@ -2788,7 +2763,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2788 | Transfer.TransferInfo.Size = req.AssetInf.Data.Length; | 2763 | Transfer.TransferInfo.Size = req.AssetInf.Data.Length; |
2789 | Transfer.TransferInfo.TransferID = req.TransferRequestID; | 2764 | Transfer.TransferInfo.TransferID = req.TransferRequestID; |
2790 | Transfer.Header.Zerocoded = true; | 2765 | Transfer.Header.Zerocoded = true; |
2791 | OutPacket(Transfer, isWearable ? ThrottleOutPacketType.Task : ThrottleOutPacketType.Asset); | 2766 | OutPacket(Transfer, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset); |
2792 | 2767 | ||
2793 | if (req.NumPackets == 1) | 2768 | if (req.NumPackets == 1) |
2794 | { | 2769 | { |
@@ -2799,7 +2774,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2799 | TransferPacket.TransferData.Data = req.AssetInf.Data; | 2774 | TransferPacket.TransferData.Data = req.AssetInf.Data; |
2800 | TransferPacket.TransferData.Status = 1; | 2775 | TransferPacket.TransferData.Status = 1; |
2801 | TransferPacket.Header.Zerocoded = true; | 2776 | TransferPacket.Header.Zerocoded = true; |
2802 | OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task : ThrottleOutPacketType.Asset); | 2777 | OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset); |
2803 | } | 2778 | } |
2804 | else | 2779 | else |
2805 | { | 2780 | { |
@@ -2832,7 +2807,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2832 | TransferPacket.TransferData.Status = 1; | 2807 | TransferPacket.TransferData.Status = 1; |
2833 | } | 2808 | } |
2834 | TransferPacket.Header.Zerocoded = true; | 2809 | TransferPacket.Header.Zerocoded = true; |
2835 | OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task : ThrottleOutPacketType.Asset); | 2810 | OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset); |
2836 | 2811 | ||
2837 | processedLength += chunkSize; | 2812 | processedLength += chunkSize; |
2838 | packetNumber++; | 2813 | packetNumber++; |
@@ -3605,7 +3580,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3605 | } | 3580 | } |
3606 | } | 3581 | } |
3607 | 3582 | ||
3608 | OutPacket(aw, ThrottleOutPacketType.Task); | 3583 | OutPacket(aw, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority); |
3609 | } | 3584 | } |
3610 | 3585 | ||
3611 | public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) | 3586 | public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) |