diff options
author | Dahlia Trimble | 2009-01-26 08:04:12 +0000 |
---|---|---|
committer | Dahlia Trimble | 2009-01-26 08:04:12 +0000 |
commit | fa99f013786f282d4266553477fcb1beb078e4d0 (patch) | |
tree | 2e7d72500e672324330f1e5e3324b86c6c40ab73 | |
parent | Move file contents into file. (diff) | |
download | opensim-SC-fa99f013786f282d4266553477fcb1beb078e4d0.zip opensim-SC-fa99f013786f282d4266553477fcb1beb078e4d0.tar.gz opensim-SC-fa99f013786f282d4266553477fcb1beb078e4d0.tar.bz2 opensim-SC-fa99f013786f282d4266553477fcb1beb078e4d0.tar.xz |
more eventqueue IM nonsense
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 15 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs | 27 |
2 files changed, 35 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 83ae115..e8e674f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1214,19 +1214,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1214 | { | 1214 | { |
1215 | dialog = 17; | 1215 | dialog = 17; |
1216 | 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( | 1217 | OSD Item = Environment.EventQueueHelper.ChatterboxInvitation( |
1224 | new UUID("00000000-68f9-1111-024e-222222111123"), | 1218 | new UUID("00000000-68f9-1111-024e-222222111123"), |
1225 | "Test Group", fromAgent, message, toAgent, fromName, dialog, 0, | 1219 | "Test Group", fromAgent, message, toAgent, fromName, dialog, 0, |
1226 | false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket); | 1220 | false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket); |
1227 | 1221 | ||
1228 | eq.Enqueue(Item, toAgent); | 1222 | eq.Enqueue(Item, toAgent); |
1229 | m_log.Info("########### eq chatterbox invitation #############\n" + Item); | 1223 | m_log.Info("########### eq ChatterboxInvitation #############\n" + Item); |
1224 | |||
1225 | Item = Environment.EventQueueHelper.ChatterBoxSessionAgentListUpdates( | ||
1226 | new UUID("00000000-68f9-1111-024e-222222111123"), | ||
1227 | fromAgent, false, false, false); | ||
1228 | |||
1229 | eq.Enqueue(Item, toAgent); | ||
1230 | m_log.Info("########### eq ChatterBoxSessionAgentListUpdates #############\n" + Item); | ||
1230 | } | 1231 | } |
1231 | 1232 | ||
1232 | System.Console.WriteLine("SendInstantMessage: " + msg); | 1233 | System.Console.WriteLine("SendInstantMessage: " + msg); |
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs index 5f471e5..b74375f 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs | |||
@@ -275,5 +275,32 @@ namespace OpenSim.Region.Environment | |||
275 | chatterboxInvitation.Add("body", body); | 275 | chatterboxInvitation.Add("body", body); |
276 | return chatterboxInvitation; | 276 | return chatterboxInvitation; |
277 | } | 277 | } |
278 | |||
279 | public static OSD ChatterBoxSessionAgentListUpdates(UUID sessionID, | ||
280 | UUID agentID, bool canVoiceChat, bool isModerator, bool textMute) | ||
281 | { | ||
282 | OSDMap body = new OSDMap(); | ||
283 | OSDMap agentUpdates = new OSDMap(); | ||
284 | OSDMap infoDetail = new OSDMap(); | ||
285 | OSDMap mutes = new OSDMap(); | ||
286 | |||
287 | mutes.Add("text", OSD.FromBoolean(textMute)); | ||
288 | infoDetail.Add("can_voice_chat", OSD.FromBoolean(canVoiceChat)); | ||
289 | infoDetail.Add("is_moderator", OSD.FromBoolean(isModerator)); | ||
290 | infoDetail.Add("mutes", mutes); | ||
291 | OSDMap info = new OSDMap(); | ||
292 | info.Add("info", infoDetail); | ||
293 | agentUpdates.Add(agentID.ToString(), info); | ||
294 | body.Add("agent_updates", agentUpdates); | ||
295 | body.Add("session_id", OSD.FromUUID(sessionID)); | ||
296 | body.Add("updates", new OSD()); | ||
297 | |||
298 | OSDMap chatterBoxSessionAgentListUpdates = new OSDMap(); | ||
299 | chatterBoxSessionAgentListUpdates.Add("message", OSD.FromString("ChatterBoxSessionAgentListUpdates")); | ||
300 | chatterBoxSessionAgentListUpdates.Add("body", body); | ||
301 | |||
302 | return chatterBoxSessionAgentListUpdates; | ||
303 | } | ||
304 | |||
278 | } | 305 | } |
279 | } | 306 | } |