diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
| commit | dc48f1c7417f0f49ad1bd32330845ce17a29eece (patch) | |
| tree | 8772aff5f32c1702228b7ca7e324fbd077269854 /indra/llcommon/indra_constants.h | |
| parent | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (diff) | |
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
Diffstat (limited to 'indra/llcommon/indra_constants.h')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index 89b276e3b3..a0b1293639 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -38,9 +38,10 @@ // At 45 Hz collisions seem stable and objects seem // to settle down at a reasonable rate. // JC 3/18/2003 -const F32 HAVOK_TIMESTEP = 1.f / 45.f; +const F32 PHYSICS_TIMESTEP = 1.f / 45.f; const F32 COLLISION_TOLERANCE = 0.1f; +const F32 HALF_COLLISION_TOLERANCE = COLLISION_TOLERANCE * 0.5f; // Time constants const U32 HOURS_PER_LINDEN_DAY = 4; @@ -53,6 +54,8 @@ const F32 REGION_WIDTH_METERS = 256.f; const S32 REGION_WIDTH_UNITS = 256; const U32 REGION_WIDTH_U32 = 256; +const F32 REGION_HEIGHT_METERS = 4096.f; + // Bits for simulator performance query flags enum LAND_STAT_FLAGS { @@ -87,7 +90,7 @@ const F32 MAX_AGENT_HEIGHT = 2.65f - 2.0f * COLLISION_TOLERANCE; // For linked sets const S32 MAX_CHILDREN_PER_TASK = 255; -const S32 MAX_CHILDREN_PER_PHYSICAL_TASK = 31; +const S32 MAX_CHILDREN_PER_PHYSICAL_TASK = 32; const S32 MAX_JOINTS_PER_OBJECT = 1; // limiting to 1 until Havok 2.x |