diff options
author | Dave Parks <davep@lindenlab.com> | 2011-05-16 12:34:15 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-05-16 12:34:15 -0500 |
commit | 8a92612fd976b6e38383d9ee46be5b51053e0998 (patch) | |
tree | 0c06d99c2b6a8aaa5c78661b488ff8b59b83c523 /indra/llmath/xform.h | |
parent | 0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff) | |
parent | d6fda15c34896db3b911c3719871ce317edaab1d (diff) |
merge
Diffstat (limited to 'indra/llmath/xform.h')
-rw-r--r-- | indra/llmath/xform.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/xform.h b/indra/llmath/xform.h index 5159c1cbfe..1b50749b3e 100644 --- a/indra/llmath/xform.h +++ b/indra/llmath/xform.h @@ -32,11 +32,11 @@ const F32 MAX_OBJECT_Z = 4096.f; // should match REGION_HEIGHT_METERS, Pre-havok4: 768.f const F32 MIN_OBJECT_Z = -256.f; -const F32 DEFAULT_MAX_PRIM_SCALE = 10.f; +const F32 DEFAULT_MAX_PRIM_SCALE = 64.f; +const F32 DEFAULT_MAX_PRIM_SCALE_NO_MESH = 10.f; const F32 MIN_PRIM_SCALE = 0.01f; const F32 MAX_PRIM_SCALE = 65536.f; // something very high but not near FLT_MAX - class LLXform { protected: |