diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-23 13:02:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-23 13:02:08 -0700 |
| commit | 0cc832c38a34013a9eebf8d3caad2921bead265d (patch) | |
| tree | 8d916206343d075fc85e90e83ec9dabe8b01376d /indra/llmath/llrigginginfo.h | |
| parent | 03c4458bdcc6821a3047f93b729d412e274ab9af (diff) | |
| parent | 9f6849e081deac1f62ab3010ee0984e17749c9e6 (diff) | |
Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev
merge maint-a (including maint-x) into gltf_development
Diffstat (limited to 'indra/llmath/llrigginginfo.h')
| -rw-r--r-- | indra/llmath/llrigginginfo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/llrigginginfo.h b/indra/llmath/llrigginginfo.h index 059c6ae082..fb550d013f 100644 --- a/indra/llmath/llrigginginfo.h +++ b/indra/llmath/llrigginginfo.h @@ -27,8 +27,8 @@ // Stores information related to associated rigged mesh vertices // This lives in llmath because llvolume lives in llmath. -#ifndef LL_LLRIGGINGINFO_H -#define LL_LLRIGGINGINFO_H +#ifndef LL_LLRIGGINGINFO_H +#define LL_LLRIGGINGINFO_H #include "llvector4a.h" @@ -46,7 +46,7 @@ public: void merge(const LLJointRiggingInfo& other); private: - LLVector4a mRiggedExtents[2]; + LLVector4a mRiggedExtents[2]; bool mIsRiggedTo; }; |