diff options
| author | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
| commit | cd2b97b3e6446449443700ae9a1521c402c93850 (patch) | |
| tree | 0c45e5a05cdcb6956fb859c9fef834a5c5613a04 /linden/indra/llmath | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | Display selected avatars larger than normal, zoom in at a reasonable speed. I... (diff) | |
| download | meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.zip meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.gz meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.bz2 meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Conflicts:
linden/indra/newview/llfloaterchat.cpp
linden/indra/newview/llfloatermap.cpp
linden/indra/newview/llinventorybridge.cpp
linden/indra/newview/llnetmap.cpp
linden/indra/newview/llviewermessage.cpp
linden/indra/newview/llviewerobjectlist.cpp
Diffstat (limited to 'linden/indra/llmath')
| -rw-r--r-- | linden/indra/llmath/xform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llmath/xform.h b/linden/indra/llmath/xform.h index 6f880cb..b41219c 100644 --- a/linden/indra/llmath/xform.h +++ b/linden/indra/llmath/xform.h | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | 37 | ||
| 38 | const F32 MAX_OBJECT_Z = 4096.f; // should match REGION_HEIGHT_METERS, Pre-havok4: 768.f | 38 | const F32 MAX_OBJECT_Z = 4096.f; // should match REGION_HEIGHT_METERS, Pre-havok4: 768.f |
| 39 | const F32 MIN_OBJECT_Z = -256.f; | 39 | const F32 MIN_OBJECT_Z = -256.f; |
| 40 | const F32 DEFAULT_MAX_PRIM_SCALE = 10.f; | 40 | //const F32 DEFAULT_MAX_PRIM_SCALE = 10.f; set in llmanipscale.cpp now |
| 41 | const F32 MIN_PRIM_SCALE = 0.01f; | 41 | const F32 MIN_PRIM_SCALE = 0.01f; |
| 42 | const F32 MAX_PRIM_SCALE = 65536.f; // something very high but not near FLT_MAX | 42 | const F32 MAX_PRIM_SCALE = 65536.f; // something very high but not near FLT_MAX |
| 43 | 43 | ||