diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-06 19:47:51 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-06 19:47:51 +0100 |
| commit | 795aedf4a922f17aac667afc0c368e7fe18b0e03 (patch) | |
| tree | 21f96b09831cf518f6fe8fd02a30c985f2a71fd6 /indra/newview/llcontrolavatar.h | |
| parent | 9ae973ec5b271b99d192644cc094ef2d1e3ded2a (diff) | |
SL-966 - size and pos limit calcs moved to sep method. Global scale option for testing of size limits.
Diffstat (limited to 'indra/newview/llcontrolavatar.h')
| -rw-r--r-- | indra/newview/llcontrolavatar.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h index c72dc03efc..9924697938 100644 --- a/indra/newview/llcontrolavatar.h +++ b/indra/newview/llcontrolavatar.h @@ -40,9 +40,10 @@ public: virtual void initInstance(); // Called after construction to initialize the class. virtual ~LLControlAvatar(); + void getNewConstraintFixups(LLVector3& new_pos_constraint, F32& new_scale_constraint) const; void matchVolumeTransform(); void updateVolumeGeom(); - + void setGlobalScale(F32 scale); void recursiveScaleJoint(LLJoint *joint, F32 factor); static LLControlAvatar *createControlAvatar(LLVOVolume *obj); @@ -81,7 +82,11 @@ public: bool mMarkedForDeath; LLVector3 mPositionConstraintFixup; + F32 mScaleConstraintFixup; + static const F32 MAX_LEGAL_OFFSET; + static const F32 MAX_LEGAL_SIZE; + }; typedef std::map<LLUUID, S32> signaled_animation_map_t; |