OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

another missing file

master
UbitUmarov 2020-05-07 02:33:54 +01:00
parent 1908c095d3
commit f0fc1f628f
1 changed files with 38 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
View File

@ -243,7 +243,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_debugEnabled = verbose; m_debugEnabled = verbose;
MainConsole.Instance.Output("{0} verbose logging set to {1}", null, Name, m_debugEnabled); MainConsole.Instance.Output("{0} verbose logging set to {1}", Name, m_debugEnabled);
} }
/// <summary> /// <summary>
@ -463,30 +463,22 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
{ {
case (byte)InstantMessageDialog.SessionAdd: case (byte)InstantMessageDialog.SessionAdd:
m_groupData.AgentInvitedToGroupChatSession(fromAgentID, GroupID); m_groupData.AgentInvitedToGroupChatSession(fromAgentID, GroupID);
if(eq != null) if (eq != null)
eq.ChatterBoxSessionAgentListUpdates( {
GroupID var update = new GroupChatListAgentUpdateData(fromAgentID);
, fromAgentID var updates = new List<GroupChatListAgentUpdateData>() { update };
, client.AgentId eq.ChatterBoxSessionAgentListUpdates(GroupID, client.AgentId, updates);
, false //canVoiceChat }
, false //isModerator
, false //text mute
, true // enter
);
break; break;
case (byte)InstantMessageDialog.SessionDrop: case (byte)InstantMessageDialog.SessionDrop:
m_groupData.AgentDroppedFromGroupChatSession(fromAgentID, GroupID); m_groupData.AgentDroppedFromGroupChatSession(fromAgentID, GroupID);
if(eq != null) if (eq != null)
eq.ChatterBoxSessionAgentListUpdates( {
GroupID var update = new GroupChatListAgentUpdateData(fromAgentID, false);
, fromAgentID var updates = new List<GroupChatListAgentUpdateData>() { update };
, client.AgentId eq.ChatterBoxSessionAgentListUpdates(GroupID, client.AgentId, updates);
, false //canVoiceChat }
, false //isModerator
, false //text mute
, false // leave
);
break; break;
case (byte)InstantMessageDialog.SessionSend: case (byte)InstantMessageDialog.SessionSend:
@ -500,26 +492,23 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
{ {
if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Sending chatterbox invite instant message"); if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Sending chatterbox invite instant message");
if(eq != null) eq?.ChatterboxInvitation(
{ GroupID
eq.ChatterboxInvitation( , groupInfo.GroupName
GroupID , fromAgentID
, groupInfo.GroupName , msg.message
, fromAgentID , client.AgentId
, msg.message , msg.fromAgentName
, client.AgentId , msg.dialog
, msg.fromAgentName , msg.timestamp
, msg.dialog , msg.offline == 1
, msg.timestamp , (int)msg.ParentEstateID
, msg.offline == 1 , msg.Position
, (int)msg.ParentEstateID , 1
, msg.Position , new UUID(msg.imSessionID)
, 1 , msg.fromGroup
, new UUID(msg.imSessionID) , Utils.StringToBytes(groupInfo.GroupName)
, msg.fromGroup );
, Utils.StringToBytes(groupInfo.GroupName)
);
}
} }
} }
else else
@ -529,16 +518,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// if (!m_groupData.hasAgentBeenInvitedToGroupChatSession(fromAgentID, GroupID)) // if (!m_groupData.hasAgentBeenInvitedToGroupChatSession(fromAgentID, GroupID))
{ {
m_groupData.AgentInvitedToGroupChatSession(fromAgentID, GroupID); m_groupData.AgentInvitedToGroupChatSession(fromAgentID, GroupID);
eq.ChatterBoxSessionAgentListUpdates( if(eq != null)
GroupID {
, fromAgentID var update = new GroupChatListAgentUpdateData(fromAgentID);
, client.AgentId var updates = new List<GroupChatListAgentUpdateData>() { update };
, false //canVoiceChat eq.ChatterBoxSessionAgentListUpdates(GroupID, client.AgentId, updates);
, false //isModerator }
, false //text mute
, true // enter
);
} }
} }
break; break;
@ -628,11 +614,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
bodyMap.Add("session_info", sessionMap); bodyMap.Add("session_info", sessionMap);
IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
queue?.Enqueue(queue.BuildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId);
if (queue != null)
{
queue.Enqueue(queue.BuildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId);
}
} }
private void DebugGridInstantMessage(GridInstantMessage im) private void DebugGridInstantMessage(GridInstantMessage im)