From c48ebd889b3baa6adf051e3b114052291ac72603 Mon Sep 17 00:00:00 2001
From: Jon Wolk <jwolk@lindenlab.com>
Date: Thu, 24 Jan 2008 20:34:48 +0000
Subject: [PATCH] svn merge -r 77415:77842
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Server_abandoned
 -> release.  Per josh\'s request, this got merged directly to release, did
 not go through normal lock phase.  Made one minor change in the merge to
 avoid some silliness with the conflicts.

---
 indra/llcommon/roles_constants.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/indra/llcommon/roles_constants.h b/indra/llcommon/roles_constants.h
index 12bd21ec205..23ebcf34d6f 100644
--- a/indra/llcommon/roles_constants.h
+++ b/indra/llcommon/roles_constants.h
@@ -143,18 +143,11 @@ const U64 GP_NOTICES_RECEIVE		= 0x1LL << 43;	// Receive Notices and View Notice
 const U64 GP_PROPOSAL_START		= 0x1LL << 44;	// Start Proposal
 const U64 GP_PROPOSAL_VOTE		= 0x1LL << 45;	// Vote on Proposal
 
-// Group chat moderation related
-const U64 GP_SESSION_JOIN = 0x1LL << 16; //can join session
-const U64 GP_SESSION_VOICE = 0x1LL << 27; //can hear/talk
-const U64 GP_SESSION_MODERATOR = 0x1LL << 37; //can mute people's session
-
 const U64 GP_DEFAULT_MEMBER = GP_ACCOUNTING_ACCOUNTABLE
 								| GP_LAND_ALLOW_SET_HOME
 								| GP_NOTICES_RECEIVE
 								| GP_PROPOSAL_START
 								| GP_PROPOSAL_VOTE
-								| GP_SESSION_JOIN
-								| GP_SESSION_VOICE
 								;
 
 const U64 GP_DEFAULT_OFFICER = GP_ACCOUNTING_ACCOUNTABLE
@@ -195,8 +188,5 @@ const U64 GP_DEFAULT_OFFICER = GP_ACCOUNTING_ACCOUNTABLE
 								| GP_PROPOSAL_VOTE
 								| GP_ROLE_ASSIGN_MEMBER_LIMITED
 								| GP_ROLE_PROPERTIES
-								| GP_SESSION_MODERATOR
-								| GP_SESSION_JOIN
-								| GP_SESSION_VOICE
 								;
 #endif
-- 
GitLab