From d455d579d03523b98e9f0161716942889b7913c3 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Wed, 22 Apr 2009 18:00:59 +0000 Subject: more cleanup --- .../Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | 63 ++++++++++------------ 1 file changed, 28 insertions(+), 35 deletions(-) (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs') 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 // Force? open the group session dialog??? IEventQueue eq = m_ActiveClients[msg.toAgentID].Scene.RequestModuleInterface(); eq.ChatterboxInvitation( - GroupID - , GroupInfo.GroupName - , new UUID(msg.fromAgentID) - , msg.message, new UUID(msg.toAgentID) - , msg.fromAgentName - , msg.dialog - , msg.timestamp - , msg.offline==1 - , (int)msg.ParentEstateID - , msg.Position - , 1 - , new UUID(msg.imSessionID) - , msg.fromGroup - , Utils.StringToBytes(GroupInfo.GroupName) - ); + GroupID, + GroupInfo.GroupName, + new UUID(msg.fromAgentID), + msg.message, new UUID(msg.toAgentID), + msg.fromAgentName, + msg.dialog, + msg.timestamp, + msg.offline == 1, + (int)msg.ParentEstateID, + msg.Position, + 1, + new UUID(msg.imSessionID), + msg.fromGroup, + Utils.StringToBytes(GroupInfo.GroupName)); eq.ChatterBoxSessionAgentListUpdates( - new UUID(GroupID) - , new UUID(msg.fromAgentID) - , new UUID(msg.toAgentID) - , false //canVoiceChat - , false //isModerator - , false //text mute - ); - + new UUID(GroupID), + new UUID(msg.fromAgentID), + new UUID(msg.toAgentID), + false, //canVoiceChat + false, //isModerator + false); //text mute } } } @@ -285,13 +282,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups IEventQueue queue = remoteClient.Scene.RequestModuleInterface(); queue.ChatterBoxSessionAgentListUpdates( - new UUID(GroupID) - , new UUID(im.fromAgentID) - , new UUID(im.toAgentID) - , false //canVoiceChat - , false //isModerator - , false //text mute - ); + new UUID(GroupID), + new UUID(im.fromAgentID), + new UUID(im.toAgentID), + false, //canVoiceChat + false, //isModerator + false); //text mute } } @@ -373,12 +369,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups msg.ParentEstateID = im.ParentEstateID; msg.Position = im.Position; msg.RegionID = im.RegionID; - msg.binaryBucket = new byte[1] { 0 }; + msg.binaryBucket = new byte[1]{0}; foreach (GroupMembersData member in m_GroupsModule.GroupMembersRequest(null, groupID)) { msg.toAgentID = member.AgentID.Guid; - m_MsgTransferModule.SendInstantMessage(msg, delegate(bool success) { }); + m_MsgTransferModule.SendInstantMessage(msg, delegate(bool success) {}); } } @@ -402,14 +398,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups bodyMap.Add("success", OSD.FromBoolean(true)); bodyMap.Add("session_info", sessionMap); - IEventQueue queue = remoteClient.Scene.RequestModuleInterface(); if (queue != null) { queue.Enqueue(EventQueueHelper.buildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId); } - } @@ -428,6 +422,5 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups m_log.WarnFormat("[GROUPS-MESSAGING] IM: binaryBucket({0})", OpenMetaverse.Utils.BytesToHexString(im.binaryBucket, "BinaryBucket")); } } - } } -- cgit v1.1