diff options
author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
---|---|---|
committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
commit | e040f16a4f2e50592a125a04185fd9f06ac49522 (patch) | |
tree | 60a0e7fee37761a9278db6ab2b32f61fc38acbe1 /indra/llcommon/indra_constants.h | |
parent | c320b2cef916cc8f0e42f041c29c04bf55d40d77 (diff) | |
parent | 02701073ce70fc2e2043adf0ed7e0d6879669215 (diff) |
merge
Diffstat (limited to 'indra/llcommon/indra_constants.h')
-rw-r--r-- | indra/llcommon/indra_constants.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index b0618bfe59..95cb606240 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -245,9 +245,6 @@ const U8 SIM_ACCESS_ADULT = 42; // Seriously Adult Only const U8 SIM_ACCESS_DOWN = 254; const U8 SIM_ACCESS_MAX = SIM_ACCESS_ADULT; -// group constants -const S32 MAX_AGENT_GROUPS = 25; - // attachment constants const S32 MAX_AGENT_ATTACHMENTS = 38; const U8 ATTACHMENT_ADD = 0x80; @@ -300,6 +297,14 @@ const U32 START_LOCATION_ID_COUNT = 6; // group constants const U32 GROUP_MIN_SIZE = 2; +// gMaxAgentGroups is now sent by login.cgi, which +// looks it up from globals.xml. +// +// For now we need an old default value however, +// so the viewer can be deployed ahead of login.cgi. +// +const S32 DEFAULT_MAX_AGENT_GROUPS = 25; + // radius within which a chat message is fully audible const F32 CHAT_WHISPER_RADIUS = 10.f; const F32 CHAT_NORMAL_RADIUS = 20.f; |