diff options
| author | Melanie | 2013-07-29 02:08:05 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-29 02:08:05 +0100 |
| commit | bf283208df4a6936de85b2746112bb568d9c9d25 (patch) | |
| tree | dafe50ad8e55ac30c41f5e7ebd11992f2772c294 /OpenSim/Region/Framework/Interfaces/IGroupsModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Same issue. (diff) | |
| download | opensim-SC-bf283208df4a6936de85b2746112bb568d9c9d25.zip opensim-SC-bf283208df4a6936de85b2746112bb568d9c9d25.tar.gz opensim-SC-bf283208df4a6936de85b2746112bb568d9c9d25.tar.bz2 opensim-SC-bf283208df4a6936de85b2746112bb568d9c9d25.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IGroupsModule.cs')
| -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 6885327..9ae5e87 100644 --- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs | |||
| @@ -97,5 +97,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 97 | 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); | 98 | void InviteGroup(IClientAPI remoteClient, UUID agentID, UUID GroupID, UUID InviteeID, UUID RoleID); |
| 99 | void NotifyChange(UUID GroupID); | 99 | void NotifyChange(UUID GroupID); |
| 100 | |||
| 101 | List<DirGroupsReplyData> FindGroups(IClientAPI remoteClient, string query); | ||
| 100 | } | 102 | } |
| 101 | } \ No newline at end of file | 103 | } \ No newline at end of file |