diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:16:43 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:16:43 -0500 |
| commit | 293b35f000ca4e8a4bcf85dc4782b2a72d1887ea (patch) | |
| tree | 70c1731808e5449a56b8a38007c6c952bb559f48 /indra/llmath | |
| parent | d0cba9e9194841e8867afcbd02b3792b652756ab (diff) | |
| parent | ee39db49a38a626e72e1924e4c157b16d90e8ee6 (diff) | |
Automated merge from mesh-development
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/xform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/xform.h b/indra/llmath/xform.h index 7a9f0f62cf..1b50749b3e 100644 --- a/indra/llmath/xform.h +++ b/indra/llmath/xform.h @@ -33,10 +33,10 @@ 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 = 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: |