Second Life viewer sources 1.20.2

1 files changed, 6 insertions, 4 deletions

diff --git a/linden/indra/llmath/xform.h b/linden/indra/llmath/xform.h
index 8fd1e9e..ad2a944 100644
--- a/linden/indra/llmath/xform.h
+++ b/linden/indra/llmath/xform.h
@@ -35,10 +35,12 @@
 #include "m4math.h"
 #include "llquaternion.h"
 
-const F32 MAX_OBJECT_Z          = 768.f;
+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 MIN_OBJECT_SCALE      = 0.01f;
-const F32 MAX_OBJECT_SCALE      = 10.f;
+const F32 DEFAULT_MAX_PRIM_SCALE = 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
 {
@@ -138,7 +140,7 @@ public:
 
         void init()
         {
-                mWorldMatrix.identity();
+                mWorldMatrix.setIdentity();
                 mMin.clearVec();
                 mMax.clearVec();