aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs58
1 files changed, 29 insertions, 29 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
index 16dd0b6..a613ec2 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
120 if (!m_groupMessagingEnabled) 120 if (!m_groupMessagingEnabled)
121 return; 121 return;
122 122
123 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); 123 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
124 124
125 m_groupsModule = scene.RequestModuleInterface<IGroupsModule>(); 125 m_groupsModule = scene.RequestModuleInterface<IGroupsModule>();
126 126
@@ -157,7 +157,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
157 if (!m_groupMessagingEnabled) 157 if (!m_groupMessagingEnabled)
158 return; 158 return;
159 159
160 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); 160 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
161 161
162 m_sceneList.Remove(scene); 162 m_sceneList.Remove(scene);
163 } 163 }
@@ -201,7 +201,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
201 201
202 private void OnNewClient(IClientAPI client) 202 private void OnNewClient(IClientAPI client)
203 { 203 {
204 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] OnInstantMessage registered for {0}", client.Name); 204 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: OnInstantMessage registered for {0}", client.Name);
205 205
206 client.OnInstantMessage += OnInstantMessage; 206 client.OnInstantMessage += OnInstantMessage;
207 } 207 }
@@ -217,7 +217,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
217 217
218 if (m_debugEnabled) 218 if (m_debugEnabled)
219 { 219 {
220 m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); 220 m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
221 221
222 DebugGridInstantMessage(msg); 222 DebugGridInstantMessage(msg);
223 } 223 }
@@ -234,7 +234,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
234 234
235 private void ProcessMessageFromGroupSession(GridInstantMessage msg) 235 private void ProcessMessageFromGroupSession(GridInstantMessage msg)
236 { 236 {
237 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Session message from {0} going to agent {1}", msg.fromAgentName, msg.toAgentID); 237 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Session message from {0} going to agent {1}", msg.fromAgentName, msg.toAgentID);
238 238
239 switch (msg.dialog) 239 switch (msg.dialog)
240 { 240 {
@@ -263,7 +263,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
263 GroupRecord groupInfo = m_groupsModule.GetGroupRecord(groupID); 263 GroupRecord groupInfo = m_groupsModule.GetGroupRecord(groupID);
264 if (groupInfo != null) 264 if (groupInfo != null)
265 { 265 {
266 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Sending chatterbox invite instant message"); 266 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Sending chatterbox invite instant message");
267 267
268 // Force? open the group session dialog??? 268 // Force? open the group session dialog???
269 IEventQueue eq = activeClient.Scene.RequestModuleInterface<IEventQueue>(); 269 IEventQueue eq = activeClient.Scene.RequestModuleInterface<IEventQueue>();
@@ -303,18 +303,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
303 if (client != null) 303 if (client != null)
304 { 304 {
305 // Deliver locally, directly 305 // Deliver locally, directly
306 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Delivering to {0} locally", client.Name); 306 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Delivering to {0} locally", client.Name);
307 client.SendInstantMessage(msg); 307 client.SendInstantMessage(msg);
308 } 308 }
309 else 309 else
310 { 310 {
311 m_log.WarnFormat("[GROUPS-MESSAGING] Received a message over the grid for a client that isn't here: {0}", msg.toAgentID); 311 m_log.WarnFormat("[GROUPS-MESSAGING]: Received a message over the grid for a client that isn't here: {0}", msg.toAgentID);
312 } 312 }
313 } 313 }
314 break; 314 break;
315 315
316 default: 316 default:
317 m_log.WarnFormat("[GROUPS-MESSAGING] I don't know how to proccess a {0} message.", ((InstantMessageDialog)msg.dialog).ToString()); 317 m_log.WarnFormat("[GROUPS-MESSAGING]: I don't know how to proccess a {0} message.", ((InstantMessageDialog)msg.dialog).ToString());
318 break; 318 break;
319 } 319 }
320 } 320 }
@@ -336,7 +336,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
336 // If not in dropped list, add 336 // If not in dropped list, add
337 if (!m_agentsDroppedSession[sessionID].Contains(agentID)) 337 if (!m_agentsDroppedSession[sessionID].Contains(agentID))
338 { 338 {
339 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Dropped {1} from session {0}", sessionID, agentID); 339 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Dropped {1} from session {0}", sessionID, agentID);
340 m_agentsDroppedSession[sessionID].Add(agentID); 340 m_agentsDroppedSession[sessionID].Add(agentID);
341 } 341 }
342 } 342 }
@@ -356,7 +356,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
356 // If nessesary, add to in session list 356 // If nessesary, add to in session list
357 if (!m_agentsInGroupSession[sessionID].Contains(agentID)) 357 if (!m_agentsInGroupSession[sessionID].Contains(agentID))
358 { 358 {
359 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Added {1} to session {0}", sessionID, agentID); 359 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Added {1} to session {0}", sessionID, agentID);
360 m_agentsInGroupSession[sessionID].Add(agentID); 360 m_agentsInGroupSession[sessionID].Add(agentID);
361 } 361 }
362 } 362 }
@@ -365,7 +365,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
365 { 365 {
366 if (!m_agentsInGroupSession.ContainsKey(sessionID)) 366 if (!m_agentsInGroupSession.ContainsKey(sessionID))
367 { 367 {
368 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Creating session tracking for : {0}", sessionID); 368 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Creating session tracking for : {0}", sessionID);
369 m_agentsInGroupSession.Add(sessionID, new List<Guid>()); 369 m_agentsInGroupSession.Add(sessionID, new List<Guid>());
370 m_agentsDroppedSession.Add(sessionID, new List<Guid>()); 370 m_agentsDroppedSession.Add(sessionID, new List<Guid>());
371 } 371 }
@@ -375,7 +375,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
375 { 375 {
376 if (m_debugEnabled) 376 if (m_debugEnabled)
377 { 377 {
378 m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); 378 m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
379 379
380 DebugGridInstantMessage(im); 380 DebugGridInstantMessage(im);
381 } 381 }
@@ -388,7 +388,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
388 GroupRecord groupInfo = m_groupsModule.GetGroupRecord(groupID); 388 GroupRecord groupInfo = m_groupsModule.GetGroupRecord(groupID);
389 if (groupInfo != null) 389 if (groupInfo != null)
390 { 390 {
391 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Start Group Session for {0}", groupInfo.GroupName); 391 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Start Group Session for {0}", groupInfo.GroupName);
392 392
393 AddAgentToGroupSession(im.fromAgentID, im.imSessionID); 393 AddAgentToGroupSession(im.fromAgentID, im.imSessionID);
394 394
@@ -411,7 +411,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
411 { 411 {
412 UUID groupID = new UUID(im.toAgentID); 412 UUID groupID = new UUID(im.toAgentID);
413 413
414 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Send message to session for group {0} with session ID {1}", groupID, im.imSessionID.ToString()); 414 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Send message to session for group {0} with session ID {1}", groupID, im.imSessionID.ToString());
415 415
416 SendMessageToGroup(im, groupID); 416 SendMessageToGroup(im, groupID);
417 } 417 }
@@ -421,14 +421,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
421 421
422 private void SendMessageToGroup(GridInstantMessage im, UUID groupID) 422 private void SendMessageToGroup(GridInstantMessage im, UUID groupID)
423 { 423 {
424 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); 424 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
425 425
426 foreach (GroupMembersData member in m_groupsModule.GroupMembersRequest(null, groupID)) 426 foreach (GroupMembersData member in m_groupsModule.GroupMembersRequest(null, groupID))
427 { 427 {
428 if (m_agentsDroppedSession[im.imSessionID].Contains(member.AgentID.Guid)) 428 if (m_agentsDroppedSession[im.imSessionID].Contains(member.AgentID.Guid))
429 { 429 {
430 // Don't deliver messages to people who have dropped this session 430 // Don't deliver messages to people who have dropped this session
431 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] {0} has dropped session, not delivering to them", member.AgentID); 431 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: {0} has dropped session, not delivering to them", member.AgentID);
432 continue; 432 continue;
433 } 433 }
434 434
@@ -455,13 +455,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
455 if (client == null) 455 if (client == null)
456 { 456 {
457 // If they're not local, forward across the grid 457 // If they're not local, forward across the grid
458 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Delivering to {0} via Grid", member.AgentID); 458 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Delivering to {0} via Grid", member.AgentID);
459 m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { }); 459 m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
460 } 460 }
461 else 461 else
462 { 462 {
463 // Deliver locally, directly 463 // Deliver locally, directly
464 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Passing to ProcessMessageFromGroupSession to deliver to {0} locally", client.Name); 464 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", client.Name);
465 ProcessMessageFromGroupSession(msg); 465 ProcessMessageFromGroupSession(msg);
466 } 466 }
467 } 467 }
@@ -469,7 +469,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
469 469
470 void ChatterBoxSessionStartReplyViaCaps(IClientAPI remoteClient, string groupName, UUID groupID) 470 void ChatterBoxSessionStartReplyViaCaps(IClientAPI remoteClient, string groupName, UUID groupID)
471 { 471 {
472 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); 472 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
473 473
474 OSDMap moderatedMap = new OSDMap(4); 474 OSDMap moderatedMap = new OSDMap(4);
475 moderatedMap.Add("voice", OSD.FromBoolean(false)); 475 moderatedMap.Add("voice", OSD.FromBoolean(false));
@@ -498,15 +498,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
498 { 498 {
499 if (m_debugEnabled) 499 if (m_debugEnabled)
500 { 500 {
501 m_log.WarnFormat("[GROUPS-MESSAGING] IM: fromGroup({0})", im.fromGroup ? "True" : "False"); 501 m_log.WarnFormat("[GROUPS-MESSAGING]: IM: fromGroup({0})", im.fromGroup ? "True" : "False");
502 m_log.WarnFormat("[GROUPS-MESSAGING] IM: Dialog({0})", ((InstantMessageDialog)im.dialog).ToString()); 502 m_log.WarnFormat("[GROUPS-MESSAGING]: IM: Dialog({0})", ((InstantMessageDialog)im.dialog).ToString());
503 m_log.WarnFormat("[GROUPS-MESSAGING] IM: fromAgentID({0})", im.fromAgentID.ToString()); 503 m_log.WarnFormat("[GROUPS-MESSAGING]: IM: fromAgentID({0})", im.fromAgentID.ToString());
504 m_log.WarnFormat("[GROUPS-MESSAGING] IM: fromAgentName({0})", im.fromAgentName.ToString()); 504 m_log.WarnFormat("[GROUPS-MESSAGING]: IM: fromAgentName({0})", im.fromAgentName.ToString());
505 m_log.WarnFormat("[GROUPS-MESSAGING] IM: imSessionID({0})", im.imSessionID.ToString()); 505 m_log.WarnFormat("[GROUPS-MESSAGING]: IM: imSessionID({0})", im.imSessionID.ToString());
506 m_log.WarnFormat("[GROUPS-MESSAGING] IM: message({0})", im.message.ToString()); 506 m_log.WarnFormat("[GROUPS-MESSAGING]: IM: message({0})", im.message.ToString());
507 m_log.WarnFormat("[GROUPS-MESSAGING] IM: offline({0})", im.offline.ToString()); 507 m_log.WarnFormat("[GROUPS-MESSAGING]: IM: offline({0})", im.offline.ToString());
508 m_log.WarnFormat("[GROUPS-MESSAGING] IM: toAgentID({0})", im.toAgentID.ToString()); 508 m_log.WarnFormat("[GROUPS-MESSAGING]: IM: toAgentID({0})", im.toAgentID.ToString());
509 m_log.WarnFormat("[GROUPS-MESSAGING] IM: binaryBucket({0})", OpenMetaverse.Utils.BytesToHexString(im.binaryBucket, "BinaryBucket")); 509 m_log.WarnFormat("[GROUPS-MESSAGING]: IM: binaryBucket({0})", OpenMetaverse.Utils.BytesToHexString(im.binaryBucket, "BinaryBucket"));
510 } 510 }
511 } 511 }
512 512