diff options
author | Dr Scofield | 2009-04-22 18:00:59 +0000 |
---|---|---|
committer | Dr Scofield | 2009-04-22 18:00:59 +0000 |
commit | d455d579d03523b98e9f0161716942889b7913c3 (patch) | |
tree | b504715c1529f2994fc60930f4478b3aed1ae40c /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | |
parent | Thanks tlaukkan for a patch that Fixes asset cache url forming for MXP join r... (diff) | |
download | opensim-SC-d455d579d03523b98e9f0161716942889b7913c3.zip opensim-SC-d455d579d03523b98e9f0161716942889b7913c3.tar.gz opensim-SC-d455d579d03523b98e9f0161716942889b7913c3.tar.bz2 opensim-SC-d455d579d03523b98e9f0161716942889b7913c3.tar.xz |
more cleanup
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | 63 |
1 files changed, 28 insertions, 35 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs index 34af325..b1b25aa 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | |||
@@ -229,31 +229,28 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
229 | // Force? open the group session dialog??? | 229 | // Force? open the group session dialog??? |
230 | IEventQueue eq = m_ActiveClients[msg.toAgentID].Scene.RequestModuleInterface<IEventQueue>(); | 230 | IEventQueue eq = m_ActiveClients[msg.toAgentID].Scene.RequestModuleInterface<IEventQueue>(); |
231 | eq.ChatterboxInvitation( | 231 | eq.ChatterboxInvitation( |
232 | GroupID | 232 | GroupID, |
233 | , GroupInfo.GroupName | 233 | GroupInfo.GroupName, |
234 | , new UUID(msg.fromAgentID) | 234 | new UUID(msg.fromAgentID), |
235 | , msg.message, new UUID(msg.toAgentID) | 235 | msg.message, new UUID(msg.toAgentID), |
236 | , msg.fromAgentName | 236 | msg.fromAgentName, |
237 | , msg.dialog | 237 | msg.dialog, |
238 | , msg.timestamp | 238 | msg.timestamp, |
239 | , msg.offline==1 | 239 | msg.offline == 1, |
240 | , (int)msg.ParentEstateID | 240 | (int)msg.ParentEstateID, |
241 | , msg.Position | 241 | msg.Position, |
242 | , 1 | 242 | 1, |
243 | , new UUID(msg.imSessionID) | 243 | new UUID(msg.imSessionID), |
244 | , msg.fromGroup | 244 | msg.fromGroup, |
245 | , Utils.StringToBytes(GroupInfo.GroupName) | 245 | Utils.StringToBytes(GroupInfo.GroupName)); |
246 | ); | ||
247 | 246 | ||
248 | eq.ChatterBoxSessionAgentListUpdates( | 247 | eq.ChatterBoxSessionAgentListUpdates( |
249 | new UUID(GroupID) | 248 | new UUID(GroupID), |
250 | , new UUID(msg.fromAgentID) | 249 | new UUID(msg.fromAgentID), |
251 | , new UUID(msg.toAgentID) | 250 | new UUID(msg.toAgentID), |
252 | , false //canVoiceChat | 251 | false, //canVoiceChat |
253 | , false //isModerator | 252 | false, //isModerator |
254 | , false //text mute | 253 | false); //text mute |
255 | ); | ||
256 | |||
257 | } | 254 | } |
258 | } | 255 | } |
259 | } | 256 | } |
@@ -285,13 +282,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
285 | 282 | ||
286 | IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); | 283 | IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); |
287 | queue.ChatterBoxSessionAgentListUpdates( | 284 | queue.ChatterBoxSessionAgentListUpdates( |
288 | new UUID(GroupID) | 285 | new UUID(GroupID), |
289 | , new UUID(im.fromAgentID) | 286 | new UUID(im.fromAgentID), |
290 | , new UUID(im.toAgentID) | 287 | new UUID(im.toAgentID), |
291 | , false //canVoiceChat | 288 | false, //canVoiceChat |
292 | , false //isModerator | 289 | false, //isModerator |
293 | , false //text mute | 290 | false); //text mute |
294 | ); | ||
295 | } | 291 | } |
296 | } | 292 | } |
297 | 293 | ||
@@ -373,12 +369,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
373 | msg.ParentEstateID = im.ParentEstateID; | 369 | msg.ParentEstateID = im.ParentEstateID; |
374 | msg.Position = im.Position; | 370 | msg.Position = im.Position; |
375 | msg.RegionID = im.RegionID; | 371 | msg.RegionID = im.RegionID; |
376 | msg.binaryBucket = new byte[1] { 0 }; | 372 | msg.binaryBucket = new byte[1]{0}; |
377 | 373 | ||
378 | foreach (GroupMembersData member in m_GroupsModule.GroupMembersRequest(null, groupID)) | 374 | foreach (GroupMembersData member in m_GroupsModule.GroupMembersRequest(null, groupID)) |
379 | { | 375 | { |
380 | msg.toAgentID = member.AgentID.Guid; | 376 | msg.toAgentID = member.AgentID.Guid; |
381 | m_MsgTransferModule.SendInstantMessage(msg, delegate(bool success) { }); | 377 | m_MsgTransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
382 | } | 378 | } |
383 | } | 379 | } |
384 | 380 | ||
@@ -402,14 +398,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
402 | bodyMap.Add("success", OSD.FromBoolean(true)); | 398 | bodyMap.Add("success", OSD.FromBoolean(true)); |
403 | bodyMap.Add("session_info", sessionMap); | 399 | bodyMap.Add("session_info", sessionMap); |
404 | 400 | ||
405 | |||
406 | IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); | 401 | IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); |
407 | 402 | ||
408 | if (queue != null) | 403 | if (queue != null) |
409 | { | 404 | { |
410 | queue.Enqueue(EventQueueHelper.buildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId); | 405 | queue.Enqueue(EventQueueHelper.buildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId); |
411 | } | 406 | } |
412 | |||
413 | } | 407 | } |
414 | 408 | ||
415 | 409 | ||
@@ -428,6 +422,5 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
428 | m_log.WarnFormat("[GROUPS-MESSAGING] IM: binaryBucket({0})", OpenMetaverse.Utils.BytesToHexString(im.binaryBucket, "BinaryBucket")); | 422 | m_log.WarnFormat("[GROUPS-MESSAGING] IM: binaryBucket({0})", OpenMetaverse.Utils.BytesToHexString(im.binaryBucket, "BinaryBucket")); |
429 | } | 423 | } |
430 | } | 424 | } |
431 | |||
432 | } | 425 | } |
433 | } | 426 | } |