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

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

@ -243,7 +243,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
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>
@ -464,29 +464,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
case (byte)InstantMessageDialog.SessionAdd:
m_groupData.AgentInvitedToGroupChatSession(fromAgentID, GroupID);
if (eq != null)
eq.ChatterBoxSessionAgentListUpdates(
GroupID
, fromAgentID
, client.AgentId
, false //canVoiceChat
, false //isModerator
, false //text mute
, true // enter
);
{
var update = new GroupChatListAgentUpdateData(fromAgentID);
var updates = new List<GroupChatListAgentUpdateData>() { update };
eq.ChatterBoxSessionAgentListUpdates(GroupID, client.AgentId, updates);
}
break;
case (byte)InstantMessageDialog.SessionDrop:
m_groupData.AgentDroppedFromGroupChatSession(fromAgentID, GroupID);
if (eq != null)
eq.ChatterBoxSessionAgentListUpdates(
GroupID
, fromAgentID
, client.AgentId
, false //canVoiceChat
, false //isModerator
, false //text mute
, false // leave
);
{
var update = new GroupChatListAgentUpdateData(fromAgentID, false);
var updates = new List<GroupChatListAgentUpdateData>() { update };
eq.ChatterBoxSessionAgentListUpdates(GroupID, client.AgentId, updates);
}
break;
case (byte)InstantMessageDialog.SessionSend:
@ -500,9 +492,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
{
if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Sending chatterbox invite instant message");
if(eq != null)
{
eq.ChatterboxInvitation(
eq?.ChatterboxInvitation(
GroupID
, groupInfo.GroupName
, fromAgentID
@ -521,7 +511,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
);
}
}
}
else
{
client.SendInstantMessage(msg);
@ -530,15 +519,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// if (!m_groupData.hasAgentBeenInvitedToGroupChatSession(fromAgentID, GroupID))
{
m_groupData.AgentInvitedToGroupChatSession(fromAgentID, GroupID);
eq.ChatterBoxSessionAgentListUpdates(
GroupID
, fromAgentID
, client.AgentId
, false //canVoiceChat
, false //isModerator
, false //text mute
, true // enter
);
if(eq != null)
{
var update = new GroupChatListAgentUpdateData(fromAgentID);
var updates = new List<GroupChatListAgentUpdateData>() { update };
eq.ChatterBoxSessionAgentListUpdates(GroupID, client.AgentId, updates);
}
}
}
break;
@ -628,11 +614,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
bodyMap.Add("session_info", sessionMap);
IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
if (queue != null)
{
queue.Enqueue(queue.BuildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId);
}
queue?.Enqueue(queue.BuildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId);
}
private void DebugGridInstantMessage(GridInstantMessage im)