diff options
| author | Melanie | 2012-03-27 23:14:43 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-27 23:14:43 +0100 |
| commit | b18b1b1d700d4a5ffd306e5b69a08b241188c525 (patch) | |
| tree | 2bb99cd8095a9b562f9ee075274508da973dd2a2 /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Reverse a conditional in XInventory that made updating system folder evrsion ... (diff) | |
| download | opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.zip opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.gz opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.bz2 opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IGroupsModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs index 4c501f6..6885327 100644 --- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs | |||
| @@ -93,7 +93,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 93 | void JoinGroupRequest(IClientAPI remoteClient, UUID GroupID); | 93 | void JoinGroupRequest(IClientAPI remoteClient, UUID GroupID); |
| 94 | void LeaveGroupRequest(IClientAPI remoteClient, UUID GroupID); | 94 | void LeaveGroupRequest(IClientAPI remoteClient, UUID GroupID); |
| 95 | void EjectGroupMemberRequest(IClientAPI remoteClient, UUID GroupID, UUID EjecteeID); | 95 | void EjectGroupMemberRequest(IClientAPI remoteClient, UUID GroupID, UUID EjecteeID); |
| 96 | void EjectGroupMember(IClientAPI remoteClient, UUID agentID, UUID GroupID, UUID EjecteeID); | ||
| 96 | void InviteGroupRequest(IClientAPI remoteClient, UUID GroupID, UUID InviteeID, UUID RoleID); | 97 | void InviteGroupRequest(IClientAPI remoteClient, UUID GroupID, UUID InviteeID, UUID RoleID); |
| 98 | void InviteGroup(IClientAPI remoteClient, UUID agentID, UUID GroupID, UUID InviteeID, UUID RoleID); | ||
| 97 | void NotifyChange(UUID GroupID); | 99 | void NotifyChange(UUID GroupID); |
| 98 | } | 100 | } |
| 99 | } \ No newline at end of file | 101 | } \ No newline at end of file |