Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

1 files changed, 0 insertions, 6 deletions

diff --git a/OpenSim/Addons/Groups/IGroupsServicesConnector.cs b/OpenSim/Addons/Groups/IGroupsServicesConnector.cs
index 73deb7a..a09b59e 100644
--- a/OpenSim/Addons/Groups/IGroupsServicesConnector.cs
+++ b/OpenSim/Addons/Groups/IGroupsServicesConnector.cs
@@ -92,12 +92,6 @@ namespace OpenSim.Groups
         GroupNoticeInfo GetGroupNotice(string RequestingAgentID, UUID noticeID);
         List<ExtendedGroupNoticeData> GetGroupNotices(string RequestingAgentID, UUID GroupID);
 
-        void ResetAgentGroupChatSessions(string agentID);
-        bool hasAgentBeenInvitedToGroupChatSession(string agentID, UUID groupID);
-        bool hasAgentDroppedGroupChatSession(string agentID, UUID groupID);
-        void AgentDroppedFromGroupChatSession(string agentID, UUID groupID);
-        void AgentInvitedToGroupChatSession(string agentID, UUID groupID);
-
     }
 
     public class GroupInviteInfo