Second Life viewer sources 1.20.2

1 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index eceb576..77f3d8c 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/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
 
@@ -339,7 +342,7 @@ const U32 MAP_ITEM_LAND_FOR_SALE = 0x07;
 const U32 MAP_ITEM_CLASSIFIED = 0x08;
 
 // Crash reporter behavior
-const char* const CRASH_SETTINGS_FILE = "crash_settings.xml";
+const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml";
 const char* const CRASH_BEHAVIOR_SETTING = "CrashSubmitBehavior";
 const S32 CRASH_BEHAVIOR_ASK = 0;
 const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1;