Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-05-05 09:49:10 +01:00
79 changed files with 2423 additions and 1604 deletions

View File

@@ -34,31 +34,27 @@ namespace OpenSim.Region.Framework.Interfaces
{
public interface ICapabilitiesModule
{
void NewUserConnection(AgentCircuitData agent);
/// <summary>
/// Add a caps handler for the given agent. If the CAPS handler already exists for this agent,
/// then it is replaced by a new CAPS handler.
///
/// FIXME: On login this is called twice, once for the login and once when the connection is made.
/// This is somewhat innefficient and should be fixed. The initial login creation is necessary
/// since the client asks for capabilities immediately after being informed of the seed.
/// </summary>
/// <param name="agentId"></param>
/// <param name="capsObjectPath"></param>
void AddCapsHandler(UUID agentId);
void CreateCaps(UUID agentId);
/// <summary>
/// Remove the caps handler for a given agent.
/// </summary>
/// <param name="agentId"></param>
void RemoveCapsHandler(UUID agentId);
void RemoveCaps(UUID agentId);
/// <summary>
/// Will return null if the agent doesn't have a caps handler registered
/// </summary>
/// <param name="agentId"></param>
Caps GetCapsHandlerForUser(UUID agentId);
Caps GetCapsForUser(UUID agentId);
void SetAgentCapsSeeds(AgentCircuitData agent);
Dictionary<ulong, string> GetChildrenSeeds(UUID agentID);

View File

@@ -57,5 +57,7 @@ namespace OpenSim.Region.Framework.Interfaces
bool isModerator, bool textMute);
void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID);
void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID);
OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono);
OSD BuildEvent(string eventName, OSD eventBody);
}
}