diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 15:27:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-15 15:27:36 +0300 |
commit | 4ddaeb377271361f4a104774709d4ba31568e9de (patch) | |
tree | 0c19f415cb30983169a1a6aa3559b83841ee78e3 /indra/llmath/llrigginginfo.cpp | |
parent | 26f70456d1e9059c48d25e08fc07f893315b1f3c (diff) | |
parent | 363b89947c580e1056cb5f4ae32ebfd9eaf12a17 (diff) |
Merge pull request #1477 from secondlife/marchcat/x-c-merge
Maint X -> Maint C merge
Diffstat (limited to 'indra/llmath/llrigginginfo.cpp')
-rw-r--r-- | indra/llmath/llrigginginfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/llrigginginfo.cpp b/indra/llmath/llrigginginfo.cpp index 0de07950c1..23dbddd78e 100644 --- a/indra/llmath/llrigginginfo.cpp +++ b/indra/llmath/llrigginginfo.cpp @@ -46,7 +46,7 @@ void LLJointRiggingInfo::setIsRiggedTo(bool val) { mIsRiggedTo = val; } - + LLVector4a *LLJointRiggingInfo::getRiggedExtents() { return mRiggedExtents; @@ -120,8 +120,8 @@ void LLJointRiggingInfoTab::clear() void showDetails(const LLJointRiggingInfoTab& src, const std::string& str) { - S32 count_rigged = 0; - S32 count_box = 0; + S32 count_rigged = 0; + S32 count_box = 0; LLVector4a zero_vec; zero_vec.clear(); for (S32 i=0; i<src.size(); i++) |