diff options
| author | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
| commit | 189599b6ff0c4e6b81e761fbc990c057189359f2 (patch) | |
| tree | 1e9e0e91bae9bb1ee53e57ac91cdbbfc9f6dba95 /indra/llmessage/llregionflags.h | |
| parent | fd46865a502036b9e4414e7ec4950faf551b1f14 (diff) | |
Merging from server/server-1.25 back to trunk.
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
Diffstat (limited to 'indra/llmessage/llregionflags.h')
| -rw-r--r-- | indra/llmessage/llregionflags.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llmessage/llregionflags.h b/indra/llmessage/llregionflags.h index 972a184a62..53a1e4ea1a 100644 --- a/indra/llmessage/llregionflags.h +++ b/indra/llmessage/llregionflags.h @@ -4,7 +4,7 @@ * * $LicenseInfo:firstyear=2002&license=viewergpl$ * - * Copyright (c) 2002-2007, Linden Research, Inc. + * Copyright (c) 2002-2008, Linden Research, Inc. * * Second Life Viewer Source Code * The source code in this file ("Source Code") is provided by Linden Lab @@ -60,8 +60,10 @@ const U32 REGION_FLAGS_BLOCK_LAND_RESELL = (1 << 7); // All content wiped once per night const U32 REGION_FLAGS_SANDBOX = (1 << 8); const U32 REGION_FLAGS_NULL_LAYER = (1 << 9); -const U32 REGION_FLAGS_SKIP_AGENT_ACTION = (1 << 10); -const U32 REGION_FLAGS_SKIP_UPDATE_INTEREST_LIST= (1 << 11); +// const U32 REGION_FLAGS_SKIP_AGENT_ACTION = (1 << 10); +const U32 REGION_FLAGS_HARD_ALLOW_LAND_TRANSFER = (1 << 10); // Region allows land reselling +// const U32 REGION_FLAGS_SKIP_UPDATE_INTEREST_LIST= (1 << 11); +const U32 REGION_FLAGS_HARD_ALLOW_POST_CLASSIFIED = (1 << 11); // Region allows posting of classified ads const U32 REGION_FLAGS_SKIP_COLLISIONS = (1 << 12); // Pin all non agent rigid bodies const U32 REGION_FLAGS_SKIP_SCRIPTS = (1 << 13); const U32 REGION_FLAGS_SKIP_PHYSICS = (1 << 14); // Skip all physics |