mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 02:36:00 +08:00
* May fix mantis #4603.
* My local git wants to commit the groups files for line endings, I'm gonna let it do it.
This commit is contained in:
@@ -203,12 +203,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||
return;
|
||||
}
|
||||
|
||||
m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name);
|
||||
|
||||
m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name);
|
||||
|
||||
m_groupsServerURI = groupsConfig.GetString("GroupsServerURI", string.Empty);
|
||||
if ((m_groupsServerURI == null) ||
|
||||
(m_groupsServerURI == string.Empty))
|
||||
{
|
||||
{
|
||||
m_log.ErrorFormat("Please specify a valid Simian Server for GroupsServerURI in OpenSim.ini, [Groups]");
|
||||
m_connectorEnabled = false;
|
||||
return;
|
||||
@@ -1000,53 +1000,53 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||
SimianAddGeneric(groupID, "GroupNotice", noticeID.ToString(), Notice);
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region GroupSessionTracking
|
||||
|
||||
public void ResetAgentGroupChatSessions(UUID agentID)
|
||||
{
|
||||
Dictionary<string, OSDMap> agentSessions;
|
||||
|
||||
if (SimianGetGenericEntries(agentID, "GroupSessionDropped", out agentSessions))
|
||||
{
|
||||
foreach (string GroupID in agentSessions.Keys)
|
||||
{
|
||||
SimianRemoveGenericEntry(agentID, "GroupSessionDropped", GroupID);
|
||||
}
|
||||
}
|
||||
|
||||
if (SimianGetGenericEntries(agentID, "GroupSessionInvited", out agentSessions))
|
||||
{
|
||||
foreach (string GroupID in agentSessions.Keys)
|
||||
{
|
||||
SimianRemoveGenericEntry(agentID, "GroupSessionInvited", GroupID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public bool hasAgentDroppedGroupChatSession(UUID agentID, UUID groupID)
|
||||
{
|
||||
OSDMap session;
|
||||
return SimianGetGenericEntry(agentID, "GroupSessionDropped", groupID.ToString(), out session);
|
||||
}
|
||||
|
||||
public void AgentDroppedFromGroupChatSession(UUID agentID, UUID groupID)
|
||||
{
|
||||
SimianAddGeneric(agentID, "GroupSessionDropped", groupID.ToString(), new OSDMap());
|
||||
}
|
||||
|
||||
public void AgentInvitedToGroupChatSession(UUID agentID, UUID groupID)
|
||||
{
|
||||
SimianAddGeneric(agentID, "GroupSessionInvited", groupID.ToString(), new OSDMap());
|
||||
}
|
||||
|
||||
public bool hasAgentBeenInvitedToGroupChatSession(UUID agentID, UUID groupID)
|
||||
{
|
||||
OSDMap session;
|
||||
return SimianGetGenericEntry(agentID, "GroupSessionDropped", groupID.ToString(), out session);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region GroupSessionTracking
|
||||
|
||||
public void ResetAgentGroupChatSessions(UUID agentID)
|
||||
{
|
||||
Dictionary<string, OSDMap> agentSessions;
|
||||
|
||||
if (SimianGetGenericEntries(agentID, "GroupSessionDropped", out agentSessions))
|
||||
{
|
||||
foreach (string GroupID in agentSessions.Keys)
|
||||
{
|
||||
SimianRemoveGenericEntry(agentID, "GroupSessionDropped", GroupID);
|
||||
}
|
||||
}
|
||||
|
||||
if (SimianGetGenericEntries(agentID, "GroupSessionInvited", out agentSessions))
|
||||
{
|
||||
foreach (string GroupID in agentSessions.Keys)
|
||||
{
|
||||
SimianRemoveGenericEntry(agentID, "GroupSessionInvited", GroupID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public bool hasAgentDroppedGroupChatSession(UUID agentID, UUID groupID)
|
||||
{
|
||||
OSDMap session;
|
||||
return SimianGetGenericEntry(agentID, "GroupSessionDropped", groupID.ToString(), out session);
|
||||
}
|
||||
|
||||
public void AgentDroppedFromGroupChatSession(UUID agentID, UUID groupID)
|
||||
{
|
||||
SimianAddGeneric(agentID, "GroupSessionDropped", groupID.ToString(), new OSDMap());
|
||||
}
|
||||
|
||||
public void AgentInvitedToGroupChatSession(UUID agentID, UUID groupID)
|
||||
{
|
||||
SimianAddGeneric(agentID, "GroupSessionInvited", groupID.ToString(), new OSDMap());
|
||||
}
|
||||
|
||||
public bool hasAgentBeenInvitedToGroupChatSession(UUID agentID, UUID groupID)
|
||||
{
|
||||
OSDMap session;
|
||||
return SimianGetGenericEntry(agentID, "GroupSessionDropped", groupID.ToString(), out session);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private void EnsureRoleNotSelectedByMember(UUID groupID, UUID roleID, UUID userID)
|
||||
@@ -1321,8 +1321,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||
return false;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user