diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2007-10-22 18:17:47 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2007-10-22 18:17:47 +0000 |
| commit | 94bcd2c47d7ba25693ae582e71e028142d3bc13b (patch) | |
| tree | 058dd54f0085351cc9ffc35901efb1a221a56745 /indra/llcommon | |
| parent | aa8b0cbe690eef9ed4fb7f6f9e8cc75a0a073d76 (diff) | |
svn merge -r 71902:71933 svn+ssh://svn.lindenlab.com/svn/linden/branches/expire-group-voice-channels -> release. Reverted 2 changes from the merge that were useless code.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/roles_constants.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llcommon/roles_constants.h b/indra/llcommon/roles_constants.h index 54e6827ac7..1a7c977f21 100644 --- a/indra/llcommon/roles_constants.h +++ b/indra/llcommon/roles_constants.h @@ -142,11 +142,17 @@ 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 +const U64 GP_SESSION_JOIN = 0x1LL << 46; //can join session +const U64 GP_SESSION_VOICE = 0x1LL << 47; //can hear/talk +const U64 GP_SESSION_MODERATOR = 0x1LL << 49; //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 @@ -187,5 +193,8 @@ 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 |