oops, add file missing from last commit

refactor out redundant method from GroupsMessagingModule
slimupdates
Justin Clark-Casey (justincc) 2010-04-01 22:45:01 +01:00
parent c33b1de9df
commit 938905df1e
2 changed files with 80 additions and 9 deletions

View File

@ -0,0 +1,73 @@
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Region.Framework.Interfaces
{
/// <summary>
/// Provide mechanisms for messaging groups.
/// </summary>
///
/// TODO: Provide a mechanism for receiving group messages as well as sending them
///
public interface IGroupsMessagingModule
{
/// <summary>
/// Start a group chat session.
/// </summary>
/// You must call this before calling SendMessageToGroup(). If a chat session for this group is already taking
/// place then the agent will added to that session.
/// <param name="agentID">
/// A UUID that represents the agent being added. If you are agentless (e.g. you are
/// a region module), then you can use any random ID.
/// </param>
/// <param name="groupID">
/// The ID for the group to join. Currently, the session ID used is identical to the
/// group ID.
/// </param>
/// <returns>
/// True if the chat session was started successfully, false otherwise.
/// </returns>
bool StartGroupChatSession(UUID agentID, UUID groupID);
/// <summary>
/// Send a message to an entire group.
/// </summary>
/// <param name="im">
/// The message itself. The fields that must be populated are
///
/// imSessionID - Populate this with the group ID (session ID and group ID are currently identical)
/// fromAgentName - Populate this with whatever arbitrary name you want to show up in the chat dialog
/// message - The message itself
/// dialog - This must be (byte)InstantMessageDialog.SessionSend
/// </param>
/// <param name="groupID"></param>
void SendMessageToGroup(GridInstantMessage im, UUID groupID);
}
}

View File

@ -203,16 +203,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
GroupRecord groupInfo = m_groupsModule.GetGroupRecord(groupID);
if (groupInfo != null)
return StartGroupChatSession(agentID.Guid, groupInfo);
{
AddAgentToGroupSession(agentID.Guid, groupID.Guid);
return true;
}
else
{
return false;
}
protected bool StartGroupChatSession(Guid agentID, GroupRecord groupInfo)
{
AddAgentToGroupSession(agentID, groupInfo.GroupID.Guid);
return true;
}
public void SendMessageToGroup(GridInstantMessage im, UUID groupID)
@ -455,7 +453,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
if (groupInfo != null)
{
StartGroupChatSession(im.fromAgentID, groupInfo);
AddAgentToGroupSession(im.fromAgentID, groupInfo.GroupID.Guid);
ChatterBoxSessionStartReplyViaCaps(remoteClient, groupInfo.GroupName, groupID);