diff options
| author | Robert Knop <prospero@lindenlab.com> | 2009-04-09 00:20:15 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2009-04-09 00:20:15 +0000 |
| commit | fa121d8ee18978ffc25e9faeffcfa1d7c6e1592e (patch) | |
| tree | 2fbe5f4a61cef96b932b198480991ea913daeca1 /indra/llcommon | |
| parent | 2768539bfe2bf8f2d370fcef03ae7f15b55e0579 (diff) | |
svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merging from server-1.26 to trunk
Only a few conflicts:
scripts/farm_distribute : the upload rate in trunk was even more
conservative than the one I switched to in
1.26, so kept the trunk version.
indra/llcommon/llversionserver.h : did svn revert to keep trunk
indra/newsim/lltask.cpp : svn is weird. The merge conflict was one
that it's not obvious why it was there.
However, Simon and I looked at it, and the
solution was obvious : keep the trunk blob
where the conflict was flagged.
indra/lib/python : conflict was differing versions of the eventlib
extern. did svn revert . to keep trunk.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 10 | ||||
| -rw-r--r-- | indra/llcommon/llversionserver.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index ae7863d100..e6ebdfd8cf 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -362,6 +362,16 @@ const U32 MAP_ITEM_CLASSIFIED = 0x08; const U32 MAP_ITEM_ADULT_EVENT = 0x09; const U32 MAP_ITEM_LAND_FOR_SALE_ADULT = 0x0a; +// Region map layer numbers +const S32 MAP_SIM_OBJECTS = 0; +const S32 MAP_SIM_TERRAIN = 1; +const S32 MAP_SIM_LAND_FOR_SALE = 2; // Transparent alpha overlay of land for sale +const S32 MAP_SIM_IMAGE_TYPES = 3; // Number of map layers +const S32 MAP_SIM_INFO_MASK = 0x00FFFFFF; // Agent access may be stuffed into upper byte +const S32 MAP_SIM_LAYER_MASK = 0x0000FFFF; // Layer info is in lower 16 bits +const S32 MAP_SIM_RETURN_NULL_SIMS = 0x00010000; +const S32 MAP_SIM_PRELUDE = 0x00020000; + // Crash reporter behavior const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml"; const char* const CRASH_BEHAVIOR_SETTING = "CrashSubmitBehavior"; diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index f9b84dd6bd..f191f8b4f5 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -36,7 +36,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 27; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 112940; +const S32 LL_VERSION_BUILD = 116936; const char * const LL_CHANNEL = "Second Life Server"; |