aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs30
1 files changed, 28 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 8257508..7b80f45 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -35,6 +35,7 @@ using System.Timers;
35using System.Xml; 35using System.Xml;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenMetaverse.Packets; 37using OpenMetaverse.Packets;
38using OpenMetaverse.StructuredData;
38using log4net; 39using log4net;
39using OpenSim.Framework; 40using OpenSim.Framework;
40using OpenSim.Framework.Client; 41using OpenSim.Framework.Client;
@@ -1182,6 +1183,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1182 string fromName, byte dialog, uint timeStamp, 1183 string fromName, byte dialog, uint timeStamp,
1183 UUID transactionID, bool fromGroup, byte[] binaryBucket) 1184 UUID transactionID, bool fromGroup, byte[] binaryBucket)
1184 { 1185 {
1186
1185 if (((Scene)(m_scene)).Permissions.CanInstantMessage(fromAgent, toAgent)) 1187 if (((Scene)(m_scene)).Permissions.CanInstantMessage(fromAgent, toAgent))
1186 { 1188 {
1187 ImprovedInstantMessagePacket msg 1189 ImprovedInstantMessagePacket msg
@@ -1205,8 +1207,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1205 msg.MessageBlock.Message = Utils.StringToBytes(message); 1207 msg.MessageBlock.Message = Utils.StringToBytes(message);
1206 msg.MessageBlock.BinaryBucket = binaryBucket; 1208 msg.MessageBlock.BinaryBucket = binaryBucket;
1207 1209
1208 //System.Console.WriteLine("SendInstantMessage: " + msg); 1210 if (message.StartsWith("[grouptest]"))
1209 OutPacket(msg, ThrottleOutPacketType.Task); 1211 { // this block is test code for implementing group IM - delete when group IM is finished
1212 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
1213 if (eq != null)
1214 {
1215 dialog = 17;
1216
1217 //OSD Item = Environment.EventQueueHelper.ChatterboxInvitation(
1218 // new UUID("00000000-68f9-1111-024e-222222111123"),
1219 // "Test Group", fromAgent, message, toAgent, fromName, dialog, 0,
1220 // false, 0, new Vector3(), 1, transactionID, fromGroup,
1221 // Utils.StringToBytes("Test Group"));
1222
1223 OSD Item = Environment.EventQueueHelper.ChatterboxInvitation(
1224 new UUID("00000000-68f9-1111-024e-222222111123"),
1225 "Test Group", fromAgent, message, toAgent, fromName, dialog, 0,
1226 false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket);
1227
1228 eq.Enqueue(Item, toAgent);
1229 m_log.Info("########### eq chatterbox invitation #############\n" + Item);
1230 }
1231
1232 System.Console.WriteLine("SendInstantMessage: " + msg);
1233 }
1234 else
1235 OutPacket(msg, ThrottleOutPacketType.Task);
1210 } 1236 }
1211 } 1237 }
1212 1238